Revert 34998, more stabbing in the dark to find a perf regression - Mac: impl...

chrome/browser/cocoa/browser_window_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.
 
 #include <Carbon/Carbon.h>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #import "base/scoped_nsobject.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/cocoa/find_bar_bridge.h"
 #import "chrome/browser/cocoa/fullscreen_window.h"
 #import "chrome/browser/cocoa/infobar_container_controller.h"
 #import "chrome/browser/cocoa/sad_tab_controller.h"
 #import "chrome/browser/cocoa/status_bubble_mac.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
+#include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util_mac.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
@@ skipping 772 matching lines @@
 
       // If the item is toggleable, find its toggle state and
       // try to update it.  This is a little awkward, but the alternative is
       // to check after a commandDispatch, which seems worse.
       [self updateToggleStateWithTag:tag forItem:item];
     }
   }
   return enable;
 }
 
+- (ToolbarController*)toolbarController {
+  return toolbarController_.get();
+}
+
 // Called when the user picks a menu or toolbar item when this window is key.
 // Calls through to the browser object to execute the command. This assumes that
 // the command is supported and doesn't check, otherwise it would have been
 // disabled in the UI in validateUserInterfaceItem:.
 - (void)commandDispatch:(id)sender {
   NSInteger tag = [sender tag];
   switch (tag) {
     case IDC_RELOAD:
       if ([sender isKindOfClass:[NSButton class]]) {
         // We revert the bar when the reload button is pressed, but don't when
@@ skipping 151 matching lines @@
 - (void)detachTabView:(NSView*)view {
   int index = [tabStripController_ modelIndexForTabView:view];
   browser_->tabstrip_model()->DetachTabContentsAt(index);
 }
 
 - (NSView*)selectedTabView {
   return [tabStripController_ selectedTabView];
 }
 
 - (TabStripController*)tabStripController {
-  return tabStripController_.get();
-}
-
-- (ToolbarController*)toolbarController {
-  return toolbarController_.get();
+  return tabStripController_;
 }
 
 - (void)setIsLoading:(BOOL)isLoading {
   [toolbarController_ setIsLoading:isLoading];
 }
 
 // Make the location bar the first responder, if possible.
 - (void)focusLocationBar {
   [toolbarController_ focusLocationBar];
 }
@@ skipping 513 matching lines @@
           [controller getDesiredToolbarHeightCompression]];
 }
 
 // (Private/TestingAPI)
 - (void)resetWindowGrowthState {
   windowTopGrowth_ = 0;
   windowBottomGrowth_ = 0;
   isShrinkingFromZoomed_ = NO;
 }
 
+// Our implementation of the |URLDropTargetWindowController| protocol just
+// reflects everything to the |tabStripController_|.
+- (void)dropURLs:(NSArray*)urls at:(NSPoint)location {
+  [tabStripController_ dropURLs:urls at:location];
+}
+
+- (void)indicateDropURLsAt:(NSPoint)location {
+  [tabStripController_ indicateDropURLsAt:location];
+}
+
+- (void)hideDropURLsIndicator {
+  [tabStripController_ hideDropURLsIndicator];
+}
+
 @end
 
 @implementation BrowserWindowController (Private)
 
 - (void)saveWindowPositionIfNeeded {
   if (browser_ != BrowserList::GetLastActive())
     return;
 
   if (!g_browser_process || !g_browser_process->local_state() ||
       !browser_->ShouldSaveWindowPlacement())
@@ skipping 396 matching lines @@
   if (frameOverlayInactiveImage) {
     [theme setValue:frameOverlayInactiveImage
        forAttribute:@"overlay"
               style:GTMThemeStyleWindow
               state:GTMThemeStateInactiveWindow];
   }
 
   return theme;
 }
 @end