Adds LocationBarContainer that contains

chrome/browser/ui/views/toolbar_view.h

 // Copyright (c) 2012 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_UI_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/reload_button.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
 class BrowserActionsContainer;
 class Browser;
+class LocationBarContainer;
 class WrenchMenu;
 
 namespace views {
 class MenuListener;
 }
 
 // The Browser Window's toolbar.
 class ToolbarView : public views::AccessiblePaneView,
                     public views::MenuButtonListener,
                     public ui::AcceleratorProvider,
                     public LocationBarView::Delegate,
                     public content::NotificationObserver,
                     public CommandUpdater::CommandObserver,
                     public views::ButtonListener {
  public:
   // The view class name.
   static const char kViewClassName[];
 
   explicit ToolbarView(Browser* browser);
   virtual ~ToolbarView();
 
-  // Create the contents of the Browser Toolbar. |popup_parent_view| is the
+  // Create the contents of the Browser Toolbar. |location_bar_parent| is the
+  // view the LocationBarContainer is added to. |popup_parent_view| is the
   // View to add the omnibox popup view to.
   // TODO(sky): clearly describe when |popup_parent_view| is used.
-  void Init(views::View* popup_parent_view);
+  void Init(views::View* location_bar_parent, views::View* popup_parent_view);
 
   // Updates the toolbar (and transitively the location bar) with the states of
   // the specified |tab|.  If |should_restore_state| is true, we're switching
   // (back?) to this tab and should restore any previous location bar state
   // (such as user editing) as well.
   void Update(content::WebContents* tab, bool should_restore_state);
 
   // Set focus to the toolbar with complete keyboard access, with the
   // focus initially set to the app menu. Focus will be restored
   // to the last focused view if the user escapes.
@@ skipping 12 matching lines @@
   // badge.
   gfx::ImageSkia GetAppMenuIcon(views::CustomButton::ButtonState state);
 
   virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel);
 
   // Accessors...
   Browser* browser() const { return browser_; }
   BrowserActionsContainer* browser_actions() const { return browser_actions_; }
   ReloadButton* reload_button() const { return reload_; }
   LocationBarView* location_bar() const { return location_bar_; }
+  LocationBarContainer* location_bar_container() const {
+    return location_bar_container_;
+  }
   views::MenuButton* app_menu() const { return app_menu_; }
 
   // Overridden from AccessiblePaneView
   virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::MenuButtonListener:
   virtual void OnMenuButtonClicked(views::View* source,
                                    const gfx::Point& point) OVERRIDE;
 
@@ skipping 84 matching lines @@
   // Shows the critical notification bubble against the wrench menu.
   void ShowCriticalNotification();
 
   // Updates the badge and the accessible name of the app menu (Wrench).
   void UpdateAppMenuState();
 
   // Gets a badge for the wrench icon corresponding to the number of
   // unacknowledged background pages in the system.
   gfx::ImageSkia GetBackgroundPageBadge();
 
+  // Sets the bounds of the LocationBarContainer. |bounds| is in the coordinates
+  // of |this|.
+  void SetLocationBarContainerBounds(const gfx::Rect& bounds);
+
   scoped_ptr<BackForwardMenuModel> back_menu_model_;
   scoped_ptr<BackForwardMenuModel> forward_menu_model_;
 
   // The model that contains the security level, text, icon to display...
   ToolbarModel* model_;
 
   // Controls
   views::ImageButton* back_;
   views::ImageButton* forward_;
   ReloadButton* reload_;
   views::ImageButton* home_;
   LocationBarView* location_bar_;
+  LocationBarContainer* location_bar_container_;
   BrowserActionsContainer* browser_actions_;
   views::MenuButton* app_menu_;
   Browser* browser_;
 
   // Contents of the profiles menu to populate with profile names.
   scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
   DisplayMode display_mode_;
 
   // Wrench menu.
   scoped_ptr<WrenchMenu> wrench_menu_;
 
   // A list of listeners to call when the menu opens.
   ObserverList<views::MenuListener> menu_listeners_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_