Convert the AutocompletePopupPositioner into a BubblePositioner in preparatio...

chrome/browser/cocoa/toolbar_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_TOOLBAR_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
 #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"
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/common/pref_member.h"
 
-class AutocompletePopupPositioner;
 @class AutocompleteTextField;
 @class AutocompleteTextFieldEditor;
 @class BackForwardMenuController;
+class Browser;
+class BubblePositioner;
+class CommandUpdater;
 @class DelayedMenuButton;
-@class MenuButton;
-class Browser;
-class CommandUpdater;
 class LocationBar;
 class LocationBarViewMac;
+@class MenuButton;
 namespace ToolbarControllerInternal {
 class PrefObserverBridge;
 }
 class Profile;
 class TabContents;
 class ToolbarModel;
 class ToolbarView;
 
 // A controller for the toolbar in the browser window. Manages
 // updating the state for location bar and back/fwd/reload/go buttons.
-// Manages the bookmark bar and it's position in the window relative to
+// Manages the bookmark bar and its position in the window relative to
 // the web content view.
 
 @interface ToolbarController :
     NSViewController<CommandObserverProtocol, ViewResizer> {
  @private
   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_;
   scoped_nsobject<BookmarkBarController> bookmarkBarController_;
   id<ViewResizer> resizeDelegate_;  // weak
   id<BookmarkURLOpener> bookmarkBarDelegate_;  // weak
   scoped_nsobject<BackForwardMenuController> backMenuController_;
   scoped_nsobject<BackForwardMenuController> forwardMenuController_;
 
   // Used for monitoring the optional toolbar button prefs.
   scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
-  // Used to positioner the omnibox popup view.
-  scoped_ptr<AutocompletePopupPositioner> popupPositioner_;
+  // Used to position the omnibox bubble.
+  scoped_ptr<BubblePositioner> bubblePositioner_;
   BooleanPrefMember showHomeButton_;
   BooleanPrefMember showPageOptionButtons_;
   BOOL hasToolbar_;  // if NO, we only have the location bar.
 
   // We have an extra retain in the locationBar_.
   // See comments in awakeFromNib for more info.
   scoped_nsobject<AutocompleteTextField> locationBarRetainer_;
 
   // Tracking area for mouse enter/exit/moved in the toolbar.
   scoped_nsobject<NSTrackingArea> trackingArea_;
@@ skipping 68 matching lines @@
 - (NSRect)starButtonInWindowCoordinates;
 
 @end
 
 // A set of private methods used by tests, in the absence of "friends" in ObjC.
 @interface ToolbarController(PrivateTestMethods)
 // Returns an array of views in the order of the outlets above.
 - (NSArray*)toolbarViews;
 - (void)showOptionalHomeButton;
 - (void)showOptionalPageWrenchButtons;
-- (gfx::Rect)autocompletePopupPosition;
+- (gfx::Rect)locationStackBounds;
 // Return a hover button for the current event.
 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_