diff options
author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 19:30:36 +0000 |
---|---|---|
committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 19:30:36 +0000 |
commit | 972758291350be0d1be6f97abae580d0ebccdc58 (patch) | |
tree | 61c1053b7ae7bae1004f2f1dd1d9cf4f4ba2a867 /chrome/browser/browser_process_impl.h | |
parent | 5504b183eb2ee5513fcc7aa203ca85078f90725e (diff) | |
download | chromium_src-972758291350be0d1be6f97abae580d0ebccdc58.zip chromium_src-972758291350be0d1be6f97abae580d0ebccdc58.tar.gz chromium_src-972758291350be0d1be6f97abae580d0ebccdc58.tar.bz2 |
Split the BrowserPolicyConnector into platform parts.
The BrowserPolicyConnector is the class that instantiates the rest of the
policy code and wires it up to the rest of the browser (e.g. by overriding
local state prefs at the BrowserProcessImpl). It also hosts some utilities
and other central components.
That class has grown over time and contains many platform-specific parts;
it also had chrome-specific code that can't be used on iOS.
This change breaks the class into 3 pieces:
- the new BrowserPolicyConnector is the base class and lives in the component,
so that an iOS subclass can be created in a subsequent CL. This is what
g_browser_process holds now.
- chrome/browser/policy contains ChromeBrowserPolicyConnector which overrides it
and provides Chrome-specific initialization.
- chrome/browser/chromeos/policy contains BrowserPolicyConnectorChromeOS which
inherits from ChromeBrowserPolicyConnector and adds ChromeOS-specific
components.
ChromeBrowserPolicyConnector and the future BrowserPolicyConnectorIos only add
configuration and no new methods, so the base class available from
g_browser_process covers all current uses.
BrowserPolicyConnectorChromeOS has methods that are needed on ChromeOS, and can
now be obtained via
g_browser_process->platform_parts()->browser_policy_connector_chromeos().
This CL doesn't make any functional changes; no behavior should be changed at
all.
BUG=275292
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/141133003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.h')
-rw-r--r-- | chrome/browser/browser_process_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 9436c98..931b81f 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -172,12 +172,12 @@ class BrowserProcessImpl : public BrowserProcess, #if defined(ENABLE_CONFIGURATION_POLICY) // Must be destroyed after |local_state_|. scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_; -#endif - +#else // Must be destroyed after |local_state_|. // This is a stub when policy is not enabled. Otherwise, the PolicyService // is owned by the |browser_policy_connector_| and this is not used. scoped_ptr<policy::PolicyService> policy_service_; +#endif bool created_profile_manager_; scoped_ptr<ProfileManager> profile_manager_; |