diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 04:32:01 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 04:32:01 +0000 |
| commit | 6782a60e971b721fe4a17e902e240b48d4543d80 (patch) | |
| tree | 4d9b55a5e3c7306c0df8abcf6f68ddc7ab9ed923 /chrome/browser/extensions/component_loader.cc | |
| parent | 319a4d4d4d17fa13b4fb2c13aea82f2d0b6bdab9 (diff) | |
| download | chromium_src-6782a60e971b721fe4a17e902e240b48d4543d80.zip chromium_src-6782a60e971b721fe4a17e902e240b48d4543d80.tar.gz chromium_src-6782a60e971b721fe4a17e902e240b48d4543d80.tar.bz2 | |
Reable quickoffice and some other component apps for guest session
This is to fix a regression from https://codereview.chromium.org/27564004/
BUG=NONE
Review URL: https://codereview.chromium.org/33113006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/component_loader.cc')
| -rw-r--r-- | chrome/browser/extensions/component_loader.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 1f802b5..36a4c03 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -445,11 +445,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback"))); #if defined(OS_CHROMEOS) - if (!skip_session_components && - !command_line->HasSwitch(chromeos::switches::kGuestSession)) { - Add(IDR_WALLPAPERMANAGER_MANIFEST, - base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); - + if (!skip_session_components) { #if defined(GOOGLE_CHROME_BUILD) if (!command_line->HasSwitch( chromeos::switches::kDisableQuickofficeComponentApp)) { @@ -482,6 +478,11 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( } Add(IDR_ECHO_MANIFEST, echo_extension_path); + if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) { + Add(IDR_WALLPAPERMANAGER_MANIFEST, + base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); + } + Add(IDR_NETWORK_CONFIGURATION_MANIFEST, base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration"))); |