| commit | a28e330b65700730066cecffafecbb11742ede2c | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sun Feb 03 03:50:43 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sun Feb 03 03:50:43 2013 |
| tree | ecd62d5761eee7dd3fc8902a476b8f66ec0f4f7e | |
| parent | a9dfd3d2dac6bcca200e2930fa67ca8af4568f62 [diff] [blame] |
Revert 180282 (doesn't build without reverting r180071 too, so let's just disable the test for now.) > Revert 180055: Very likely caused http://crbug.com/173885 > > Moving chrome://tracing to content. > > > > BUG=169170 > > Review URL: https://codereview.chromium.org/12088099 > > [email protected] > Review URL: https://codereview.chromium.org/12194007 [email protected] Review URL: https://codereview.chromium.org/12197003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180285 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 32320df..78e9939 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -71,6 +71,7 @@ #include "chrome/browser/ssl/ssl_tab_helper.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/toolkit_extra_parts.h" +#include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/browser/user_style_sheet_watcher.h" @@ -1936,6 +1937,11 @@ return directory.Append(FILE_PATH_LITERAL("Hyphen")); } +ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy( + WebContents* web_contents) { + return new ChromeSelectFilePolicy(web_contents); +} + #if defined(OS_POSIX) && !defined(OS_MACOSX) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line,