Index: chrome/browser/browser_main.cc |
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc |
index c6573b6a1b1feeb57b13089cc02f5ed771cd27a7..7ec494805057344c5326e4ee7653f8d75616cf7c 100644 |
--- a/chrome/browser/browser_main.cc |
+++ b/chrome/browser/browser_main.cc |
@@ -31,11 +31,11 @@ |
#include "build/build_config.h" |
#include "chrome/browser/about_flags.h" |
#include "chrome/browser/browser_main_win.h" |
-#include "chrome/browser/defaults.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/browser_process_impl.h" |
#include "chrome/browser/browser_shutdown.h" |
#include "chrome/browser/browser_thread.h" |
+#include "chrome/browser/defaults.h" |
#include "chrome/browser/dom_ui/chrome_url_data_manager.h" |
#include "chrome/browser/extensions/extension_protocols.h" |
#include "chrome/browser/extensions/extension_service.h" |
@@ -53,6 +53,7 @@ |
#include "chrome/browser/net/sdch_dictionary_fetcher.h" |
#include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" |
#include "chrome/browser/plugin_service.h" |
+#include "chrome/browser/policy/browser_policy_context.h" |
#include "chrome/browser/prefs/browser_prefs.h" |
#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/browser/prefs/pref_value_store.h" |
@@ -114,9 +115,9 @@ |
#endif |
#if defined(OS_POSIX) && !defined(OS_MACOSX) |
-#include <dbus/dbus-glib.h> |
#include "chrome/browser/browser_main_gtk.h" |
#include "chrome/browser/ui/gtk/gtk_util.h" |
+#include <dbus/dbus-glib.h> |
#endif |
#if defined(OS_CHROMEOS) |
@@ -153,8 +154,8 @@ |
#endif // defined(OS_WIN) |
#if defined(OS_MACOSX) |
-#include <Security/Security.h> |
#include "chrome/browser/ui/cocoa/install_from_dmg.h" |
+#include <Security/Security.h> |
#endif |
#if defined(TOOLKIT_VIEWS) |
@@ -1429,6 +1430,10 @@ int BrowserMain(const MainFunctionParams& parameters) { |
PrefService* user_prefs = profile->GetPrefs(); |
DCHECK(user_prefs); |
+ // Bring up the cloud policy infrastructure for browser-global policy. |
+ g_browser_process->browser_policy_context()->Initialize( |
+ local_state, Profile::GetDefaultRequestContext()); |
+ |
// Tests should be able to tune login manager before showing it. |
// Thus only show login manager in normal (non-testing) mode. |
if (!parameters.ui_task) { |