diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-03 17:35:46 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-03 17:35:46 +0000 |
| commit | e525120b3ba3cfc326b420e528e8c7287bf83c1d (patch) | |
| tree | dc66a5d6e417a7e671462d5edb9cb8e15f4b656f /chrome/app | |
| parent | 27ba005516a8770b20fdeee80bd749f92f0f44f2 (diff) | |
| download | chromium_src-e525120b3ba3cfc326b420e528e8c7287bf83c1d.zip chromium_src-e525120b3ba3cfc326b420e528e8c7287bf83c1d.tar.gz chromium_src-e525120b3ba3cfc326b420e528e8c7287bf83c1d.tar.bz2 | |
[Mac] Make the History menu behave more like the NTP in its display of recently closed items.
Now, the menu will show Window entries that have a submenu of all the tabs. Currently, only
the complete window can be restored, not submenu items (representing individual tabs) as
this requires changing the TabRestoreService. That will come in a future CL.
This CL also significantly refactors the internals of the history menu.
XIB changes:
Re-assign tag values in the History menu to those used in HistoryMenuBridge::Tags enum.
BUG=43787
TEST=Open a window and navigate two tabs. Close window. In the History menu, there should be a "2 Tabs" item in the Recently Closed section. Select that to restore.
TEST=Open a window and navigate two tabs. Close one tab. In the History menu, there should be that individual tab entry. Select to restore.
Review URL: http://codereview.chromium.org/2481001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_resource.h | 2 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/app/nibs/MainMenu.xib | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index feadb72..c72cf1a 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -273,8 +273,6 @@ #define IDC_SYSTEM_OPTIONS 45000 // ChromeOS only #define IDC_INTERNET_OPTIONS 45100 // ChromeOS only #define IDC_HISTORY_MENU 46000 // OSX only -#define IDC_HISTORY_MENU_VISITED 46100 // OSX only -#define IDC_HISTORY_MENU_CLOSED 46200 // OSX only #define IDC_INPUT_METHODS_MENU 46300 // Linux only // Custom context menu entries diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 19ea2420..cca5768 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -7119,6 +7119,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_HISTORY_CLOSED_MAC" desc="The Mac menu item for the header of recently closed items in the history menu."> Recently Closed </message> + <message name="IDS_HISTORY_CLOSED_RESTORE_WINDOW_MAC" desc="The Mac menu item for restoring all the tabs of a recently closed window."> + Restore All Tabs + </message> <!-- Bookmarks menu --> <message name="IDS_BOOKMARK_MANAGER_MAC" desc="The Mac menu item for opening the bookmark manager, in the bookmark menu."> Bookmark Manager diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib index 38a97ec..c4e689c 100644 --- a/chrome/app/nibs/MainMenu.xib +++ b/chrome/app/nibs/MainMenu.xib @@ -878,6 +878,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">400</int> </object> <object class="NSMenuItem" id="792145602"> <reference key="NSMenu" ref="436720301"/> @@ -887,7 +888,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> - <int key="NSTag">46100</int> + <int key="NSTag">401</int> </object> <object class="NSMenuItem" id="259488787"> <reference key="NSMenu" ref="436720301"/> @@ -898,6 +899,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">440</int> </object> <object class="NSMenuItem" id="101838950"> <reference key="NSMenu" ref="436720301"/> @@ -907,7 +909,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> - <int key="NSTag">46200</int> + <int key="NSTag">441</int> </object> <object class="NSMenuItem" id="517951834"> <reference key="NSMenu" ref="436720301"/> @@ -918,6 +920,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">480</int> </object> <object class="NSMenuItem" id="64100325"> <reference key="NSMenu" ref="436720301"/> |