Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: chrome/browser/extensions/component_loader.cc

Issue 13671005: Re-apply 192420: Move login switches to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 5f4da14d79716c9aa494bbf54af523e440e2a300..e243bdeacdc809535039f30c653dfd8fd121e615 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -34,6 +34,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chromeos/chromeos_switches.h"
#endif
#if defined(ENABLE_APP_LIST)
@@ -355,7 +356,7 @@ void ComponentLoader::AddDefaultComponentExtensions(
// Skip all other extensions that require user session presence.
if (!skip_session_components) {
const CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (!command_line->HasSwitch(switches::kGuestSession))
+ if (!command_line->HasSwitch(chromeos::switches::kGuestSession))
Add(IDR_BOOKMARKS_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
@@ -423,7 +424,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
// Don't load Quickoffice component extension in Guest mode because
// it doesn't work in Incognito mode due to disabled temp fs.
// TODO(dpolukhin): enable Quickoffice in Guest mode.
- if (!command_line->HasSwitch(switches::kGuestSession)) {
+ if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) {
Add(IDR_QUICK_OFFICE_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
"/usr/share/chromeos-assets/quick_office")));
}
« no previous file with comments | « chrome/browser/chromeos/system/tray_accessibility_browsertest.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698