diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 22:55:28 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 22:55:28 +0000 |
| commit | 751fae0d3da720758f736b515012e72ce0a1e7e7 (patch) | |
| tree | f1c5857d7f2cd6e81339d647a8d4cfd1ac6a214d | |
| parent | 1ddf6e77f05c9d09bd94bf6ad140fe70f2b9b236 (diff) | |
| download | chromium_src-751fae0d3da720758f736b515012e72ce0a1e7e7.zip chromium_src-751fae0d3da720758f736b515012e72ce0a1e7e7.tar.gz chromium_src-751fae0d3da720758f736b515012e72ce0a1e7e7.tar.bz2 | |
Added SignOut for chromium OS.
Review URL: http://codereview.chromium.org/548221
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38530 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 5 | ||||
| -rw-r--r-- | chrome/browser/app_menu_model.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/defaults.cc | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ba55ed2..e53a000 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -1032,6 +1032,11 @@ each locale. --> E&xit </message> </if> + <if expr="pp_ifdef('chromeos')"> + <message name="IDS_SIGN_OUT" desc="The text label of the Sign Out menu item"> + Sign Out + </message> + </if> <!-- Keywords --> <message name="IDS_KEYWORD_SEARCH" diff --git a/chrome/browser/app_menu_model.cc b/chrome/browser/app_menu_model.cc index 8a9bc5a..93d3a43 100644 --- a/chrome/browser/app_menu_model.cc +++ b/chrome/browser/app_menu_model.cc @@ -87,7 +87,11 @@ void AppMenuModel::Build() { AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); if (browser_defaults::kShowExitMenuItem) { AddSeparator(); +#if defined(OS_CHROMEOS) + AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT); +#else AddItemWithStringId(IDC_EXIT, IDS_EXIT); +#endif } } diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc index 0f5e55f..544041d 100644 --- a/chrome/browser/defaults.cc +++ b/chrome/browser/defaults.cc @@ -18,7 +18,7 @@ const int kMiniTabWidth = 64; const bool kCanToggleSystemTitleBar = false; const bool kRestorePopups = true; const bool kShowImportOnBookmarkBar = false; -const bool kShowExitMenuItem = false; +const bool kShowExitMenuItem = true; const bool kShowAboutMenuItem = true; const bool kOSSupportsOtherBrowsers = false; const bool kDownloadPageHasShowInFolder = false; |