Skip to content

GitLab

T
tangled
Commit e9f5f3bf authored by pkasting@chromium.org's avatar pkasting@chromium.org
Browse files
Options

Make "Reopen closed tab" be "Reopen closed window" when a window is the top... 

Make "Reopen closed tab" be "Reopen closed window" when a window is the top item on the closed tabs stack.

Original patch by Miranda Callahan (see http://codereview.chromium.org/100054 ), r=me.

BUG=11183

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14910 0039d316-1c4b-4281-b951-d872f2087c98
parent 756e2592
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 43 deletions
chrome/app/generated_resources.grd
View file @ e9f5f3bf
...@@ -442,124 +442,124 @@ each locale. --> ...@@ -442,124 +442,124 @@ each locale. -->
<message name="IDS_SHOW_AS_TAB" desc="The text label for the Show As tab menu item"> <message name="IDS_SHOW_AS_TAB" desc="The text label for the Show As tab menu item">
&amp;Show as tab &amp;Show as tab
</message> </message>
<message name="IDS_NEW_WINDOW" desc="The text label of the New Window menu item" > <message name="IDS_NEW_WINDOW" desc="The text label of the New Window menu item">
&amp;New window &amp;New window
</message> </message>
<message name="IDS_PROFILE_MENU" desc="The text label of the New profile Window menu item" > <message name="IDS_PROFILE_MENU" desc="The text label of the New profile Window menu item">
New window in &amp;profile New window in &amp;profile
</message> </message>
<message name="IDS_SELECT_PROFILE" desc="The text label of the menu item to select a profile other than the ones displayed directly in the Profile submenu." > <message name="IDS_SELECT_PROFILE" desc="The text label of the menu item to select a profile other than the ones displayed directly in the Profile submenu.">
Other... Other...
</message> </message>
<message name="IDS_NEW_INCOGNITO_WINDOW" desc="The text label of the New incognito window menu item"> <message name="IDS_NEW_INCOGNITO_WINDOW" desc="The text label of the New incognito window menu item">
New &amp;incognito window New &amp;incognito window
</message> </message>
<message name="IDS_UNDO" desc="The text label of the Undo menu item" > <message name="IDS_UNDO" desc="The text label of the Undo menu item">
&amp;Undo &amp;Undo
</message> </message>
<message name="IDS_CUT" desc="The text label of the Cut menu item" > <message name="IDS_CUT" desc="The text label of the Cut menu item">
Cu&amp;t Cu&amp;t
</message> </message>
<message name="IDS_COPY" desc="The text label of the Copy menu item" > <message name="IDS_COPY" desc="The text label of the Copy menu item">
&amp;Copy &amp;Copy
</message> </message>
<message name="IDS_PASTE" desc="The text label of the Paste menu item" > <message name="IDS_PASTE" desc="The text label of the Paste menu item">
&amp;Paste &amp;Paste
</message> </message>
<message name="IDS_SELECT_ALL" desc="The text label of the Select All menu item" > <message name="IDS_SELECT_ALL" desc="The text label of the Select All menu item">
Select &amp;all Select &amp;all
</message> </message>
<message name="IDS_FIND" desc="The text label of the Find in Page menu item" > <message name="IDS_FIND" desc="The text label of the Find in Page menu item">
&amp;Find in page &amp;Find in page
</message> </message>
<message name="IDS_SAVE_PAGE" desc="The text label of the Save Page As menu item" > <message name="IDS_SAVE_PAGE" desc="The text label of the Save Page As menu item">
Save page &amp;as... Save page &amp;as...
</message> </message>
<message name="IDS_PRINT" desc="The text label of the Print... menu item. Opens a dialog box to select print settings" > <message name="IDS_PRINT" desc="The text label of the Print... menu item. Opens a dialog box to select print settings">
&amp;Print... &amp;Print...
</message> </message>
<message name="IDS_ZOOM_MENU" desc="The text label of the Zoom submenu" > <message name="IDS_ZOOM_MENU" desc="The text label of the Zoom submenu">
&amp;Zoom &amp;Zoom
</message> </message>
<message name="IDS_ZOOM_PLUS" desc="The text label of the Make Text Larger menu item" > <message name="IDS_ZOOM_PLUS" desc="The text label of the Make Text Larger menu item">
&amp;Larger &amp;Larger
</message> </message>
<message name="IDS_ZOOM_NORMAL" desc="The text label of the Make Text Normal Size menu item" > <message name="IDS_ZOOM_NORMAL" desc="The text label of the Make Text Normal Size menu item">
&amp;Normal &amp;Normal
</message> </message>
<message name="IDS_ZOOM_MINUS" desc="The text label of the Make Text Smaller menu item" > <message name="IDS_ZOOM_MINUS" desc="The text label of the Make Text Smaller menu item">
&amp;Smaller &amp;Smaller
</message> </message>
<message name="IDS_ENCODING_MENU" desc="The text label of the Encoding submenu" > <message name="IDS_ENCODING_MENU" desc="The text label of the Encoding submenu">
&amp;Encoding &amp;Encoding
</message> </message>
<message name="IDS_ENCODING_AUTO_DETECT" desc="The text label of the Auto Dectect submenu" > <message name="IDS_ENCODING_AUTO_DETECT" desc="The text label of the Auto Dectect submenu">
Auto detect Auto detect
</message> </message>
<message name="IDS_ENCODING_DISPLAY_TEMPLATE" desc="The format of encodings in the encoding menu. Encoding categories are Unicode, Western, Turkish, Cyrillic, Chinese Simplified, Thai, Arabic, Hebrew and so forth. Encoding names are UTF-8, ISO-8859-1, Windows-1251, GB2312, etc."> <message name="IDS_ENCODING_DISPLAY_TEMPLATE" desc="The format of encodings in the encoding menu. Encoding categories are Unicode, Western, Turkish, Cyrillic, Chinese Simplified, Thai, Arabic, Hebrew and so forth. Encoding names are UTF-8, ISO-8859-1, Windows-1251, GB2312, etc.">
<ph name="ENCODING_CATEGORY">$1<ex>Japanese</ex></ph> (<ph name="ENCODING_NAME">$2<ex>Shift_JIS</ex></ph>) <ph name="ENCODING_CATEGORY">$1<ex>Japanese</ex></ph> (<ph name="ENCODING_NAME">$2<ex>Shift_JIS</ex></ph>)
</message> </message>
<message name="IDS_ENCODING_UNICODE" desc="The text label of Unicode encodings" > <message name="IDS_ENCODING_UNICODE" desc="The text label of Unicode encodings">
Unicode Unicode
</message> </message>
<message name="IDS_ENCODING_WESTERN" desc="The text label of West European character encoding" > <message name="IDS_ENCODING_WESTERN" desc="The text label of West European character encoding">
Western Western
</message> </message>
<message name="IDS_ENCODING_SIMP_CHINESE" desc="The text label of Simplified Chinese encodings" > <message name="IDS_ENCODING_SIMP_CHINESE" desc="The text label of Simplified Chinese encodings">
Chinese Simplified Chinese Simplified
</message> </message>
<message name="IDS_ENCODING_TRAD_CHINESE" desc="The text label of Tradtional Chinese encodings" > <message name="IDS_ENCODING_TRAD_CHINESE" desc="The text label of Tradtional Chinese encodings">
Chinese Traditional Chinese Traditional
</message> </message>
<message name="IDS_ENCODING_KOREAN" desc="The text label of Korean encoding" > <message name="IDS_ENCODING_KOREAN" desc="The text label of Korean encoding">
Korean Korean
</message> </message>
<message name="IDS_ENCODING_JAPANESE" desc="The text label of Japanese encodings" > <message name="IDS_ENCODING_JAPANESE" desc="The text label of Japanese encodings">
Japanese Japanese
</message> </message>
<message name="IDS_ENCODING_THAI" desc="The text label of encoding thai lanuage" > <message name="IDS_ENCODING_THAI" desc="The text label of encoding thai lanuage">
Thai Thai
</message> </message>
<message name="IDS_ENCODING_CENTRAL_EUROPEAN" desc="The text label of encoding Central European" > <message name="IDS_ENCODING_CENTRAL_EUROPEAN" desc="The text label of encoding Central European">
Central European Central European
</message> </message>
<message name="IDS_ENCODING_CYRILLIC" desc="The text label of Cyrillic encodings" > <message name="IDS_ENCODING_CYRILLIC" desc="The text label of Cyrillic encodings">
Cyrillic Cyrillic
</message> </message>
<message name="IDS_ENCODING_GREEK" desc="The text label of Greek encodings" > <message name="IDS_ENCODING_GREEK" desc="The text label of Greek encodings">
Greek Greek
</message> </message>
<message name="IDS_ENCODING_BALTIC" desc="The text label of Baltic encodings" > <message name="IDS_ENCODING_BALTIC" desc="The text label of Baltic encodings">
Baltic Baltic
</message> </message>
<message name="IDS_ENCODING_SOUTH_EUROPEAN" desc="The text label of South European encodings" > <message name="IDS_ENCODING_SOUTH_EUROPEAN" desc="The text label of South European encodings">
South European South European
</message> </message>
<message name="IDS_ENCODING_NORDIC" desc="The text label of Nordic encoding" > <message name="IDS_ENCODING_NORDIC" desc="The text label of Nordic encoding">
Nordic Nordic
</message> </message>
<message name="IDS_ENCODING_CELTIC" desc="The text label of Celtic encodings" > <message name="IDS_ENCODING_CELTIC" desc="The text label of Celtic encodings">
Celtic Celtic
</message> </message>
<message name="IDS_ENCODING_ROMANIAN" desc="The text label of Romanian encoding" > <message name="IDS_ENCODING_ROMANIAN" desc="The text label of Romanian encoding">
Romanian Romanian
</message> </message>
<message name="IDS_ENCODING_TURKISH" desc="The text label of Turkish encodings" > <message name="IDS_ENCODING_TURKISH" desc="The text label of Turkish encodings">
Turkish Turkish
</message> </message>
<message name="IDS_ENCODING_ARABIC" desc="The text label of Arabic encodings"> <message name="IDS_ENCODING_ARABIC" desc="The text label of Arabic encodings">
Arabic Arabic
</message> </message>
<message name="IDS_ENCODING_HEBREW" desc="The text label of Hebrew encodings" > <message name="IDS_ENCODING_HEBREW" desc="The text label of Hebrew encodings">
Hebrew Hebrew
</message> </message>
<message name="IDS_ENCODING_VIETNAMESE" desc="The text label of Vietnamese encoding" > <message name="IDS_ENCODING_VIETNAMESE" desc="The text label of Vietnamese encoding">
Vietnamese Vietnamese
</message> </message>
<message name="IDS_DEVELOPER_MENU" desc="The text label of the Developer submenu"> <message name="IDS_DEVELOPER_MENU" desc="The text label of the Developer submenu">
Developer Developer
</message> </message>
<message name="IDS_VIEW_SOURCE" desc="The text label of the View Page Source menu item" > <message name="IDS_VIEW_SOURCE" desc="The text label of the View Page Source menu item">
View s&amp;ource View s&amp;ource
</message> </message>
<message name="IDS_DEBUGGER" desc="The text label of the JavaScript debugger menu item"> <message name="IDS_DEBUGGER" desc="The text label of the JavaScript debugger menu item">
...@@ -571,12 +571,16 @@ each locale. --> ...@@ -571,12 +571,16 @@ each locale. -->
<message name="IDS_JS_CONSOLE" desc="The text the menu to show the JS console"> <message name="IDS_JS_CONSOLE" desc="The text the menu to show the JS console">
&amp;JavaScript console &amp;JavaScript console
</message> </message>
<message name="IDS_TASK_MANAGER" desc="The text label of the Task Manager menu item" > <message name="IDS_TASK_MANAGER" desc="The text label of the Task Manager menu item">
&amp;Task manager &amp;Task manager
</message> </message>
<message name="IDS_RESTORE_TAB" desc="The text label of the Restore Tab menu item" > <message name="IDS_RESTORE_TAB" desc="The text label of the Restore Tab menu item">
R&amp;eopen closed tab R&amp;eopen closed tab
</message> </message>
<message name="IDS_RESTORE_WINDOW" desc="The text label of the Restore Window menu item">
R&amp;eopen closed window
</message>
<!-- This really belongs under Generic Terms above. --> <!-- This really belongs under Generic Terms above. -->
<message name="IDS_CLOSE" desc="A generic term for Close on buttons and menus."> <message name="IDS_CLOSE" desc="A generic term for Close on buttons and menus.">
Close Close
...@@ -1975,10 +1979,10 @@ each locale. --> ...@@ -1975,10 +1979,10 @@ each locale. -->
</message> </message>
<!-- Omnibox --> <!-- Omnibox -->
<message name="IDS_PASTE_AND_GO" desc="The text label of the Paste And Go menu item when the clipboard contains a URL" > <message name="IDS_PASTE_AND_GO" desc="The text label of the Paste And Go menu item when the clipboard contains a URL">
Pa&amp;ste and go Pa&amp;ste and go
</message> </message>
<message name="IDS_PASTE_AND_SEARCH" desc="The text label of the Paste And Go menu item when the clipboard contains a string to search for" > <message name="IDS_PASTE_AND_SEARCH" desc="The text label of the Paste And Go menu item when the clipboard contains a string to search for">
Pa&amp;ste and search Pa&amp;ste and search
</message> </message>
<message name="IDS_OMNIBOX_EMPTY_TEXT" desc="Text shown if omnibox is empty"> <message name="IDS_OMNIBOX_EMPTY_TEXT" desc="Text shown if omnibox is empty">
......
chrome/browser/views/frame/browser_view.cc
View file @ e9f5f3bf
...@@ -474,9 +474,18 @@ void BrowserView::PrepareToRunSystemMenu(HMENU menu) { ...@@ -474,9 +474,18 @@ void BrowserView::PrepareToRunSystemMenu(HMENU menu) {
// IDS_ZOOM) and on separators. // IDS_ZOOM) and on separators.
if (command != 0) { if (command != 0) {
bool enabled = browser_->command_updater()->IsCommandEnabled(command); bool enabled = browser_->command_updater()->IsCommandEnabled(command);
if (enabled && command == IDC_RESTORE_TAB) if (enabled && command == IDC_RESTORE_TAB) {
enabled = browser_->profile()->GetTabRestoreService() && TabRestoreService* tab_restore_service =
!browser_->profile()->GetTabRestoreService()->entries().empty(); browser_->profile()->GetTabRestoreService();
if (tab_restore_service && !tab_restore_service->entries().empty()) {
system_menu_->SetMenuLabel(command, l10n_util::GetString(
tab_restore_service->entries().front()->type ==
TabRestoreService::WINDOW ? IDS_RESTORE_WINDOW :
IDS_RESTORE_TAB));
} else {
enabled = false;
}
}
system_menu_->EnableMenuItemByID(command, enabled); system_menu_->EnableMenuItemByID(command, enabled);
} }
} }
......
chrome/views/controls/menu/menu.cc
View file @ e9f5f3bf
...@@ -450,6 +450,15 @@ void Menu::EnableMenuItemAt(int index, bool enabled) { ...@@ -450,6 +450,15 @@ void Menu::EnableMenuItemAt(int index, bool enabled) {
EnableMenuItem(menu_, index, MF_BYPOSITION | enable_flags); EnableMenuItem(menu_, index, MF_BYPOSITION | enable_flags);
} }
void Menu::SetMenuLabel(int item_id, const std::wstring& label) {
MENUITEMINFO mii = {0};
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_STRING;
mii.dwTypeData = const_cast<wchar_t*>(label.c_str());
mii.cch = static_cast<UINT>(label.size());
SetMenuItemInfo(menu_, item_id, false, &mii);
}
DWORD Menu::GetTPMAlignFlags() const { DWORD Menu::GetTPMAlignFlags() const {
// The manner in which we handle the menu alignment depends on whether or not // The manner in which we handle the menu alignment depends on whether or not
// the menu is displayed within a mirrored view. If the UI is mirrored, the // the menu is displayed within a mirrored view. If the UI is mirrored, the
......
chrome/views/controls/menu/menu.h
View file @ e9f5f3bf
...@@ -268,6 +268,9 @@ class Menu { ...@@ -268,6 +268,9 @@ class Menu {
void EnableMenuItemByID(int item_id, bool enabled); void EnableMenuItemByID(int item_id, bool enabled);
void EnableMenuItemAt(int index, bool enabled); void EnableMenuItemAt(int index, bool enabled);
// Sets menu label at specified index.
void SetMenuLabel(int item_id, const std::wstring& label);
// Sets an icon for an item with a given item_id. Calling this function // Sets an icon for an item with a given item_id. Calling this function
// also forces the Menu class to draw the menu, instead of relying on Windows. // also forces the Menu class to draw the menu, instead of relying on Windows.
// Returns false if the item with |item_id| is not found. // Returns false if the item with |item_id| is not found.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment