diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 22:39:57 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 22:39:57 +0000 |
| commit | 527089be7f4e9631ce19fffa56784981cc6f8135 (patch) | |
| tree | a57b3bcd847ffee8243a9a67c2fe14f16c4cfdae /chrome/browser/profiles/profile_impl.h | |
| parent | 354016f8f826ec39515caa984376e103ffc90481 (diff) | |
| download | chromium_src-527089be7f4e9631ce19fffa56784981cc6f8135.zip chromium_src-527089be7f4e9631ce19fffa56784981cc6f8135.tar.gz chromium_src-527089be7f4e9631ce19fffa56784981cc6f8135.tar.bz2 | |
Revert 86724 - Modifying the BackgroundModeManager to handle multiple profiles.
The background mode manager is now owned by the broser
The status tray is also owned by the browser process since there is only one per browser. Previously it was owned by the profile, but now that there are multiple profiles, it makes sense to have the browser process own it.
Note: This CL does not unify the status tray into one icon.
TEST=unittests (added BackgroundModeManagerTest::MultiProfile)
BUG=80069,82215
Review URL: http://codereview.chromium.org/6914021
TBR=rlp@chromium.org
Review URL: http://codereview.chromium.org/7068025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_impl.h')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 77977cc..f5eb627 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -109,6 +109,7 @@ class ProfileImpl : public Profile, virtual SpellCheckHost* GetSpellCheckHost(); virtual void ReinitializeSpellCheckHost(bool force); virtual WebKitContext* GetWebKitContext(); + virtual StatusTray* GetStatusTray(); virtual void MarkAsCleanShutdown(); virtual void InitExtensions(bool extensions_enabled); virtual void InitPromoResources(); @@ -240,6 +241,7 @@ class ProfileImpl : public Profile, scoped_refptr<WebDataService> web_data_service_; scoped_refptr<PasswordStore> password_store_; scoped_refptr<WebKitContext> webkit_context_; + scoped_ptr<StatusTray> status_tray_; scoped_refptr<PersonalDataManager> personal_data_manager_; scoped_refptr<fileapi::FileSystemContext> file_system_context_; scoped_ptr<BrowserSignin> browser_signin_; |