diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 02:56:10 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 02:56:10 +0000 |
| commit | 73f113e1f5becb94370d9c17ca3f6896c23a2dc4 (patch) | |
| tree | 0b700fa9ac2f71812b092793304cf3e4361c78d9 | |
| parent | 4cce3f3fe0c697cabc905e945c9db258de83dcec (diff) | |
| download | chromium_src-73f113e1f5becb94370d9c17ca3f6896c23a2dc4.zip chromium_src-73f113e1f5becb94370d9c17ca3f6896c23a2dc4.tar.gz chromium_src-73f113e1f5becb94370d9c17ca3f6896c23a2dc4.tar.bz2 | |
Renaming Open full screen -> Open maximized.
BUG=124642
TEST=none
Review URL: http://codereview.chromium.org/10180008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133617 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 8 | ||||
| -rw-r--r-- | chrome/browser/ui/views/ash/app_list/extension_app_item.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 3bda15c..e394829 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9581,6 +9581,10 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" desc="Text for the button that opens the app full screen. (In sentence case.)"> Open full screen </message> + <message name="IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED" + desc="Text for the button that opens the app maximized. (In sentence case.)"> + Open maximized + </message> </if> <if expr="pp_ifdef('use_titlecase')"> @@ -9620,6 +9624,10 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" desc="Text for the button that opens the app full screen. (In title case.)"> Open Full Screen </message> + <message name="IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED" + desc="Text for the button that opens the app maximized. (In title case.)"> + Open Maximized + </message> </if> <if expr="pp_ifdef('chromeos')"> diff --git a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc index 0e0550e..e996593 100644 --- a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc +++ b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc @@ -348,9 +348,11 @@ ui::MenuModel* ExtensionAppItem::GetContextMenuModel() { context_menu_model_->AddCheckItemWithStringId( LAUNCH_TYPE_WINDOW, IDS_APP_CONTEXT_MENU_OPEN_WINDOW); + // Even though the launch type is Full Screen it is more accurately + // described as Maximized in Ash. context_menu_model_->AddCheckItemWithStringId( LAUNCH_TYPE_FULLSCREEN, - IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN); + IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED); context_menu_model_->AddSeparator(); context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS); context_menu_model_->AddItemWithStringId(UNINSTALL, diff --git a/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc index 30fe5c4..623ef4b 100644 --- a/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc +++ b/chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc @@ -34,9 +34,11 @@ LauncherContextMenu::LauncherContextMenu(ChromeLauncherDelegate* delegate, AddCheckItemWithStringId( LAUNCH_TYPE_WINDOW, IDS_APP_CONTEXT_MENU_OPEN_WINDOW); + // Even though the launch type is Full Screen it is more accurately + // described as Maximized in Ash. AddCheckItemWithStringId( LAUNCH_TYPE_FULLSCREEN, - IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN); + IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED); } else if (item_.type == ash::TYPE_BROWSER_SHORTCUT) { AddItem(MENU_NEW_WINDOW, l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_WINDOW)); |