diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 23:17:17 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 23:17:17 +0000 |
| commit | 4793c9449382bbc28dc9b865b1e77177c9a2feaf (patch) | |
| tree | f159eabc0862f8cfa6a6352c482674336ed3def5 /chrome/browser/profile_impl.h | |
| parent | ba463e96863261ba783e374fa7148fa263c9da4a (diff) | |
| download | chromium_src-4793c9449382bbc28dc9b865b1e77177c9a2feaf.zip chromium_src-4793c9449382bbc28dc9b865b1e77177c9a2feaf.tar.gz chromium_src-4793c9449382bbc28dc9b865b1e77177c9a2feaf.tar.bz2 | |
Enable and disable Chat Manager component extension based on labs preference setting.
BUG=56429
TEST=unit_tests --gtest_filter=ExtensionsServiceTest.*
Review URL: http://codereview.chromium.org/3120029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile_impl.h')
| -rw-r--r-- | chrome/browser/profile_impl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/profile_impl.h b/chrome/browser/profile_impl.h index e378290..9331d34 100644 --- a/chrome/browser/profile_impl.h +++ b/chrome/browser/profile_impl.h @@ -18,7 +18,9 @@ #include "chrome/common/notification_registrar.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/preferences.h" +namespace chromeos { +class Preferences; +} #endif // The default profile implementation. @@ -242,7 +244,7 @@ class ProfileImpl : public Profile, scoped_refptr<ChromeBlobStorageContext> blob_storage_context_; #if defined(OS_CHROMEOS) - chromeos::Preferences chromeos_preferences_; + scoped_ptr<chromeos::Preferences> chromeos_preferences_; scoped_refptr<chromeos::ProxyConfigServiceImpl> chromeos_proxy_config_service_impl_; |