summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 14:26:19 +0000
committeraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 14:26:19 +0000
commitdc8e5373c25a40cf68ae61d05bffb6b327b7f2be (patch)
treedd63aad4725ad9673abc6db690db0f1faf21f5b5
parent409dbf70f66357d8796d2cc4cf7eb1ad857127d6 (diff)
downloadchromium_src-dc8e5373c25a40cf68ae61d05bffb6b327b7f2be.zip
chromium_src-dc8e5373c25a40cf68ae61d05bffb6b327b7f2be.tar.gz
chromium_src-dc8e5373c25a40cf68ae61d05bffb6b327b7f2be.tar.bz2
Uses 'Exit guest mode' instead of 'Sing Out'.
BUG=chromium-os:5942 TEST=Enter guest mode, click on menu, notice 'Exit guest mode' label at the bottom. Review URL: http://codereview.chromium.org/3429017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60285 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/browser/wrench_menu_model.cc6
2 files changed, 8 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 816ea13..bdd6d1f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1053,6 +1053,9 @@ each locale. -->
<message name="IDS_SIGN_OUT" desc="The text label of the Sign Out menu item">
Sign Out
</message>
+ <message name="IDS_EXIT_GUEST_MODE" desc="The text label of the Exit guest mode menu item">
+ Exit guest mode
+ </message>
</if>
<!-- Keywords -->
diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc
index c421baa..eae5c4f 100644
--- a/chrome/browser/wrench_menu_model.cc
+++ b/chrome/browser/wrench_menu_model.cc
@@ -406,7 +406,11 @@ void WrenchMenuModel::Build() {
if (browser_defaults::kShowExitMenuItem) {
AddSeparator();
#if defined(OS_CHROMEOS)
- AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kBWSI)) {
+ AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE);
+ } else {
+ AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
+ }
#else
AddItemWithStringId(IDC_EXIT, IDS_EXIT);
#endif