diff options
author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 23:35:11 +0000 |
---|---|---|
committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 23:35:11 +0000 |
commit | 6a01f63416eee6e35ce9d38163cc631280127fa8 (patch) | |
tree | 574d7559a260f1a20a4f99b04a0fd5b1d8e3403f /chrome/browser/ui/webui | |
parent | 5953e5be319746b060d6b48ae0694fe18bbeeea1 (diff) | |
download | chromium_src-6a01f63416eee6e35ce9d38163cc631280127fa8.zip chromium_src-6a01f63416eee6e35ce9d38163cc631280127fa8.tar.gz chromium_src-6a01f63416eee6e35ce9d38163cc631280127fa8.tar.bz2 |
Move login switches to src/chromeos
We will need access to these switches in src/chromeos as we migrate
login code there.
BUG=226495
Review URL: https://codereview.chromium.org/13532012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
4 files changed, 12 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc index fac1fbf..066a583 100644 --- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc @@ -13,6 +13,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chromeos/chromeos_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/dbus/session_manager_client.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 86e5ce1..455f190 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -60,6 +60,10 @@ #include "ui/webui/jstemplate_builder.h" #include "ui/webui/web_ui_util.h" +#if defined(OS_CHROMEOS) +#include "chromeos/chromeos_switches.h" +#endif + #if defined(OS_MACOSX) #include "chrome/browser/platform_util.h" #endif @@ -279,7 +283,8 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() { const char* new_tab_link = kLearnMoreIncognitoUrl; // TODO(altimofeev): consider implementation without 'if def' usage. #if defined(OS_CHROMEOS) - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + chromeos::switches::kGuestSession)) { new_tab_message_ids = IDS_NEW_TAB_GUEST_SESSION_MESSAGE; new_tab_html_idr = IDR_GUEST_SESSION_TAB_HTML; new_tab_link = kLearnMoreGuestSessionUrl; diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index dabe85a..af5055c 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -89,6 +89,7 @@ #if !defined(OS_CHROMEOS) #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" #include "chrome/browser/ui/webui/options/advanced_options_utils.h" +#include "chromeos/chromeos_switches.h" #endif #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc index 13c34c6..5256c8d 100644 --- a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" #include "chrome/common/chrome_switches.h" +#include "chromeos/chromeos_switches.h" namespace { @@ -12,10 +13,10 @@ namespace { // switches. class GuestModeOptionsBrowserTest : public options::OptionsBrowserTest { public: - GuestModeOptionsBrowserTest() : OptionsBrowserTest() {} + GuestModeOptionsBrowserTest() : OptionsBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - command_line->AppendSwitch(switches::kGuestSession); + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + command_line->AppendSwitch(chromeos::switches::kGuestSession); command_line->AppendSwitch(switches::kIncognito); } }; |