Chromium Code Reviews Chromium Code Reviews
Issue 6520008:
Device policy infrastructure (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: chrome/browser/browser_main.cc |
| diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc |
| index a2f58b4d13be5bb21368e773d37b40771656e660..c55ba7c5abf84cb716840ce4deae56b8225f93f1 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" |
| @@ -54,6 +54,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_connector.h" |
| #include "chrome/browser/prefs/browser_prefs.h" |
| #include "chrome/browser/prefs/pref_service.h" |
| #include "chrome/browser/prefs/pref_value_store.h" |
| @@ -115,9 +116,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> |
|
Mattias Nissler (ping if slow)
2011/02/15 10:15:16
why? I guess I accidentally introduced this in my
Jakob Kummerow
2011/02/21 12:12:15
Done.
|
| #endif |
| #if defined(OS_CHROMEOS) |
| @@ -154,8 +155,8 @@ |
| #endif // defined(OS_WIN) |
| #if defined(OS_MACOSX) |
| -#include <Security/Security.h> |
| #include "chrome/browser/ui/cocoa/install_from_dmg.h" |
|
Mattias Nissler (ping if slow)
2011/02/15 10:15:16
same here.
Jakob Kummerow
2011/02/21 12:12:15
Done.
|
| +#include <Security/Security.h> |
| #endif |
| #if defined(TOOLKIT_VIEWS) |
| @@ -1437,6 +1438,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_connector()->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) { |
