diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 18:28:03 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 18:28:03 +0000 |
| commit | ae90f252d04c941f8ff9e7a7cfdd20b64c98cd83 (patch) | |
| tree | 64a2c51018629fb8c04c8fda563a9d21c286258d /chrome/browser/profile.cc | |
| parent | 331c251e8ec80f33c7bf5aea39f4afae814d1a7c (diff) | |
| download | chromium_src-ae90f252d04c941f8ff9e7a7cfdd20b64c98cd83.zip chromium_src-ae90f252d04c941f8ff9e7a7cfdd20b64c98cd83.tar.gz chromium_src-ae90f252d04c941f8ff9e7a7cfdd20b64c98cd83.tar.bz2 | |
Checking in chat_manager built-in extension, this time behind --enable-chat-manager flag.
Patch by seh@chromium.org
http://codereview.chromium.org/1719023/show
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1904003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index e4f2bd0..c256fee 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -739,6 +739,14 @@ void ProfileImpl::InitExtensions() { // Bookmark manager. component_extensions["bookmark_manager"] = IDR_BOOKMARKS_MANIFEST; +#if defined(OS_CHROMEOS) + // Chat manager. + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableChatManager)) { + component_extensions["chat_manager"] = IDR_CHAT_MANAGER_MANIFEST; + } +#endif + // Some sample apps to make our lives easier while we are developing extension // apps. This way we don't have to constantly install these over and over. if (CommandLine::ForCurrentProcess()->HasSwitch( |