Mac: make save/open dialogs operate as tab-modal sheets....

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
@@ skipping 83 matching lines @@
   DCHECK(model && commands && profile);
   if ((self = [super initWithNibName:@"Toolbar"
                               bundle:mac_util::MainAppBundle()])) {
     toolbarModel_ = model;
     commands_ = commands;
     profile_ = profile;
     browser_ = browser;
     resizeDelegate_ = resizeDelegate;
     hasToolbar_ = YES;
 
-    // Register for notificaotions about state changes for the toolbar buttons
+    // Register for notifications about state changes for the toolbar buttons.
     commandObserver_.reset(new CommandObserverBridge(self, commands));
     commandObserver_->ObserveCommand(IDC_BACK);
     commandObserver_->ObserveCommand(IDC_FORWARD);
     commandObserver_->ObserveCommand(IDC_RELOAD);
     commandObserver_->ObserveCommand(IDC_HOME);
     commandObserver_->ObserveCommand(IDC_STAR);
+    commandObserver_->ObserveCommand(IDC_OPEN_CURRENT_URL);
+    commandObserver_->ObserveCommand(IDC_PAGE_MENU_BUTTON);
+    commandObserver_->ObserveCommand(IDC_WRENCH_MENU_BUTTON);
   }
   return self;
 }
 
 - (void)dealloc {
   // Make sure any code in the base class which assumes [self view] is
   // the "parent" view continues to work.
   hasToolbar_ = YES;
 
   if (trackingArea_.get())
@@ skipping 108 matching lines @@
 // corresponding UI element.
 - (void)enabledStateChangedForCommand:(NSInteger)command enabled:(BOOL)enabled {
   NSButton* button = nil;
   switch (command) {
     case IDC_BACK:
       button = backButton_;
       break;
     case IDC_FORWARD:
       button = forwardButton_;
       break;
+    case IDC_RELOAD:
+      button = reloadButton_;
+      break;
     case IDC_HOME:
       button = homeButton_;
       break;
     case IDC_STAR:
       button = starButton_;
       break;
+    case IDC_OPEN_CURRENT_URL:
+      // We have two things to enable/disable.
+      [locationBar_ setEnabled:enabled];
+      button = goButton_;
+      break;
+    case IDC_PAGE_MENU_BUTTON:
+      button = pageButton_;
+      break;
+    case IDC_WRENCH_MENU_BUTTON:
+      button = wrenchButton_;
+      break;
   }
   [button setEnabled:enabled];
 }
 
-// Init the enabled state of the buttons on the toolbar to match the state in
+// Init the enabled state of the controls on the toolbar to match the state in
 // the controller.
 - (void)initCommandStatus:(CommandUpdater*)commands {
   [backButton_ setEnabled:commands->IsCommandEnabled(IDC_BACK) ? YES : NO];
   [forwardButton_
       setEnabled:commands->IsCommandEnabled(IDC_FORWARD) ? YES : NO];
   [reloadButton_ setEnabled:commands->IsCommandEnabled(IDC_RELOAD) ? YES : NO];
   [homeButton_ setEnabled:commands->IsCommandEnabled(IDC_HOME) ? YES : NO];
   [starButton_ setEnabled:commands->IsCommandEnabled(IDC_STAR) ? YES : NO];
+  [locationBar_ setEnabled:commands->IsCommandEnabled(IDC_OPEN_CURRENT_URL) ?
+                                                                      YES : NO];
+  [goButton_ setEnabled:commands->IsCommandEnabled(IDC_OPEN_CURRENT_URL) ?
+                                                                      YES : NO];
+  [pageButton_ setEnabled:commands->IsCommandEnabled(IDC_PAGE_MENU_BUTTON) ?
+                                                                      YES : NO];
+  [wrenchButton_ setEnabled:commands->IsCommandEnabled(IDC_WRENCH_MENU_BUTTON) ?
+                                                                      YES : NO];
 }
 
 - (void)updateToolbarWithContents:(TabContents*)tab
                shouldRestoreState:(BOOL)shouldRestore {
   locationBarView_->Update(tab, shouldRestore ? true : false);
 }
 
 - (void)setStarredState:(BOOL)isStarred {
   NSImage* starImage = nil;
   NSString* toolTip;
@@ skipping 230 matching lines @@
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
                         NSHeight(locationFrame));
   gfx::Rect stack_bounds(
       NSRectToCGRect([[self view] convertRect:r toView:nil]));
   // Inset the bounds to just inside the visible edges (see comment above).
   stack_bounds.Inset(kLocationStackEdgeWidth, 0);
   return stack_bounds;
 }
 @end