Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index 1ce14f1f5f4c80aeb70a6f6bd8e3ac0621f5cea6..7262a09c5af7757a5efed8f90d032b5150e94325 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -37,6 +37,7 @@ |
#include "chrome/browser/browser_process_impl.h" |
#include "chrome/browser/browser_shutdown.h" |
#include "chrome/browser/chrome_browser_main_extra_parts.h" |
+#include "chrome/browser/chrome_select_file_policy.h" |
#include "chrome/browser/defaults.h" |
#include "chrome/browser/extensions/default_apps_trial.h" |
#include "chrome/browser/extensions/extension_protocols.h" |
@@ -82,6 +83,7 @@ |
#include "chrome/browser/translate/translate_manager.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_finder.h" |
+#include "chrome/browser/ui/select_file_dialog.h" |
#include "chrome/browser/ui/startup/startup_browser_creator.h" |
#include "chrome/browser/ui/user_data_dir_dialog.h" |
#include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" |
@@ -1259,6 +1261,9 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { |
// just changed it to include experiments. |
child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); |
+ // We should check chrome policy before spawning a dialog. |
+ SelectFileDialog::SetFilePolicy(new ChromeSelectFilePolicy); |
+ |
// If we're running tests (ui_task is non-null), then the ResourceBundle |
// has already been initialized. |
if (parameters().ui_task) { |