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

chrome/browser/cocoa/browser_window_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
@@ skipping 29 matching lines @@
 class TabStripModelObserverBridge;
 @class TabStripView;
 @class ToolbarController;
 @class TitlebarController;
 
 @interface BrowserWindowController :
   TabWindowController<NSUserInterfaceValidations,
                       BookmarkBarControllerDelegate,
                       BrowserCommandExecutor,
                       ViewResizer,
-                      GTMThemeDelegate> {
+                      GTMThemeDelegate,
+                      URLDropTargetWindowController> {
  @private
   // The ordering of these members is important as it determines the order in
   // which they are destroyed. |browser_| needs to be destroyed last as most of
   // the other objects hold weak references to it or things it owns
   // (tab/toolbar/bookmark models, profiles, etc).
   scoped_ptr<Browser> browser_;
   NSWindow* savedRegularWindow_;
   scoped_ptr<TabStripModelObserverBridge> tabObserver_;
   scoped_ptr<BrowserWindowCocoa> windowShim_;
   scoped_nsobject<ToolbarController> toolbarController_;
@@ skipping 95 matching lines @@
 // Called to check if this controller's window is a normal window (e.g., not a
 // pop-up window). Returns YES if it is, NO otherwise.
 - (BOOL)isNormalWindow;
 
 - (BOOL)isBookmarkBarVisible;
 
 // Called after bookmark bar visibility changes (due to pref change or change in
 // tab/tab contents).
 - (void)updateBookmarkBarVisibilityWithAnimation:(BOOL)animate;
 
-// Return a weak pointer to the tab strip controller.
-- (TabStripController*)tabStripController;
-
-// Return a weak pointer to the toolbar controller.
-- (ToolbarController*)toolbarController;
-
 - (BOOL)isDownloadShelfVisible;
 
 // Lazily creates the download shelf in visible state if it doesn't exist yet.
 - (DownloadShelfController*)downloadShelf;
 
 // Retains the given FindBarCocoaController and adds its view to this
 // browser window.  Must only be called once per
 // BrowserWindowController.
 - (void)addFindBar:(FindBarCocoaController*)findBarCocoaController;
 
@@ skipping 26 matching lines @@
 // Returns YES if the window became the active per-tab sheet of the current tab,
 // or NO if the current tab already has a per-tab sheet. If this returns NO,
 // the window's |Realize()| method will be called again when the curren sheet
 // disappears. The window should then call |attachConstrainedWindow:| again.
 - (BOOL)attachConstrainedWindow:(ConstrainedWindowMac*)window;
 
 // Closes the tab sheet |window| and potentially shows the next sheet in the
 // tab's sheet queue.
 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window;
 
+// Implementation of the |URLDropTargetWindowController| protocol, which is
+// needed for URL dropping on the tab strip.
+- (void)dropURLs:(NSArray*)urls at:(NSPoint)location;
+- (void)indicateDropURLsAt:(NSPoint)location;
+- (void)hideDropURLsIndicator;
+
 @end
 
 // Methods which are either only for testing, or only public for testing.
 @interface BrowserWindowController(TestingAPI)
 
 // Put the incognito badge on the browser and adjust the tab strip
 // accordingly.
 - (void)installIncognitoBadge;
 
 // Allows us to initWithBrowser withOUT taking ownership of the browser.
 - (id)initWithBrowser:(Browser*)browser takeOwnership:(BOOL)ownIt;
 
 // Adjusts the window height by the given amount.  If the window spans from the
 // top of the current workspace to the bottom of the current workspace, the
 // height is not adjusted.  If growing the window by the requested amount would
 // size the window to be taller than the current workspace, the window height is
 // capped to be equal to the height of the current workspace.  If the window is
 // partially offscreen, its height is not adjusted at all.  This function
 // prefers to grow the window down, but will grow up if needed.  Calls to this
 // function should be followed by a call to |layoutSubviews|.
 - (void)adjustWindowHeightBy:(CGFloat)deltaH;
 
 // Return an autoreleased NSWindow suitable for fullscreen use.
 - (NSWindow*)fullscreenWindow;
 
 // Return a point suitable for the topLeft for a bookmark bubble.
 - (NSPoint)topLeftForBubble;
 
+// Return a weak pointer to the toolbar controller.
+- (ToolbarController*)toolbarController;
+
 // Resets any saved state about window growth (due to showing the bookmark bar
 // or the download shelf), so that future shrinking will occur from the bottom.
 - (void)resetWindowGrowthState;
 
 @end  // BrowserWindowController(TestingAPI)
 
 #endif  // CHROME_BROWSER_COCOA_BROWSER_WINDOW_CONTROLLER_H_