Implement back/forward toolbar menus on Mac (bug 13203).

Note: The drop-down menu is actually a drag-down (activating on
click-hold or on drag), working much like Safari's (and other Apple
apps, such as Dictionary). This can be changed to a pop-down if that's
what's desired.

[The previously included fix to bug 17990 has been split off to CL
159864.]

TODO: Show keyboard shortcut for "Show Full History".

Patch by viettrungluu.

BUG=http://crbug.com/13203
TEST=Navigate around, check out and use the menus; do so in multiple tabs and
windows.

Review URL: http://codereview.chromium.org/160496


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22478 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 3 deletions

diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h
index 73891ec..ea3ca81 100644
--- a/chrome/browser/cocoa/toolbar_controller.h
+++ b/chrome/browser/cocoa/toolbar_controller.h
@@ -11,10 +11,14 @@
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/command_observer_bridge.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
+#import "chrome/browser/cocoa/delayedmenu_button.h"
 #include "chrome/common/pref_member.h"
 
 @class AutocompleteTextField;
 @class AutocompleteTextFieldEditor;
+@class DelayedMenuButton;
+@class BackForwardMenuController;
+class Browser;
 class CommandUpdater;
 class LocationBar;
 class LocationBarViewMac;
@@ -36,6 +40,7 @@ class ToolbarView;
   ToolbarModel* toolbarModel_;  // weak, one per window
   CommandUpdater* commands_;  // weak, one per window
   Profile* profile_;  // weak, one per window
+  Browser* browser_;  // weak, one per window
   scoped_ptr<CommandObserverBridge> commandObserver_;
   scoped_ptr<LocationBarViewMac> locationBarView_;
   scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;
@@ -43,6 +48,8 @@ class ToolbarView;
   id<BookmarkURLOpener> bookmarkBarDelegate_;  // weak
   NSView* webContentView_;  // weak; where the web goes
   NSView* infoBarsView_;     // weak; where the infobars go
+  scoped_nsobject<BackForwardMenuController> backMenuController_;
+  scoped_nsobject<BackForwardMenuController> forwardMenuController_;
 
   // Used for monitoring the optional toolbar button prefs.
   scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
@@ -56,8 +63,8 @@ class ToolbarView;
   // The ordering is important for unit tests. If new items are added or the
   // ordering is changed, make sure to update |-toolbarViews| and the
   // corresponding enum in the unit tests.
-  IBOutlet NSButton* backButton_;
-  IBOutlet NSButton* forwardButton_;
+  IBOutlet DelayedMenuButton* backButton_;
+  IBOutlet DelayedMenuButton* forwardButton_;
   IBOutlet NSButton* reloadButton_;
   IBOutlet NSButton* homeButton_;
   IBOutlet NSButton* starButton_;
@@ -68,10 +75,12 @@ class ToolbarView;
 }
 
 // Initialize the toolbar and register for command updates. The profile is
-// needed for initializing the location bar.
+// needed for initializing the location bar. The browser is needed for
+// initializing the back/forward menus.
 - (id)initWithModel:(ToolbarModel*)model
            commands:(CommandUpdater*)commands
             profile:(Profile*)profile
+            browser:(Browser*)browser
      webContentView:(NSView*)webContentView
        infoBarsView:(NSView*)infoBarsView
    bookmarkDelegate:(id<BookmarkURLOpener>)delegate;