Adds LocationBarContainer that contains

chrome/browser/ui/views/toolbar_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_container.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/wrench_menu.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 84 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       back_(NULL),
       forward_(NULL),
       reload_(NULL),
       home_(NULL),
       location_bar_(NULL),
+      location_bar_container_(NULL),
       browser_actions_(NULL),
       app_menu_(NULL),
       browser_(browser),
       profiles_menu_contents_(NULL) {
   set_id(VIEW_ID_TOOLBAR);
 
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
 
@@ skipping 17 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(browser_->profile()));
 }
 
 ToolbarView::~ToolbarView() {
   // NOTE: Don't remove the command observers here.  This object gets destroyed
   // after the Browser (which owns the CommandUpdater), so the CommandUpdater is
   // already gone.
 }
 
-void ToolbarView::Init(views::View* popup_parent_view) {
+void ToolbarView::Init(views::View* location_bar_parent,
+                       views::View* popup_parent_view) {
   back_menu_model_.reset(new BackForwardMenuModel(
       browser_, BackForwardMenuModel::BACKWARD_MENU));
   forward_menu_model_.reset(new BackForwardMenuModel(
       browser_, BackForwardMenuModel::FORWARD_MENU));
   back_ = new views::ButtonDropDown(this, back_menu_model_.get());
   back_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                      ui::EF_MIDDLE_MOUSE_BUTTON);
   back_->set_tag(IDC_BACK);
   back_->SetImageAlignment(views::ImageButton::ALIGN_RIGHT,
                            views::ImageButton::ALIGN_TOP);
   back_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_BACK));
   back_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_BACK));
   back_->set_id(VIEW_ID_BACK_BUTTON);
 
   forward_ = new views::ButtonDropDown(this, forward_menu_model_.get());
   forward_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                         ui::EF_MIDDLE_MOUSE_BUTTON);
   forward_->set_tag(IDC_FORWARD);
   forward_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD));
   forward_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD));
   forward_->set_id(VIEW_ID_FORWARD_BUTTON);
 
   // Have to create this before |reload_| as |reload_|'s constructor needs it.
+  location_bar_container_ = new LocationBarContainer(location_bar_parent);
   location_bar_ = new LocationBarView(
       browser_->profile(),
       browser_->command_updater(),
       model_,
       this,
       (display_mode_ == DISPLAYMODE_LOCATION) ?
           LocationBarView::POPUP : LocationBarView::NORMAL);
+  // TODO(sky): if we want this to work on windows we need to make sure the
+  // LocationBarContainer gets focus. This will involve tweaking view_ids.
+  // location_bar_->set_view_to_focus(location_bar_container_);
+  location_bar_container_->SetLocationBarView(location_bar_);
 
   reload_ = new ReloadButton(location_bar_, browser_->command_updater());
   reload_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                        ui::EF_MIDDLE_MOUSE_BUTTON);
   reload_->set_tag(IDC_RELOAD);
   reload_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_RELOAD));
   reload_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_RELOAD));
   reload_->set_id(VIEW_ID_RELOAD_BUTTON);
 
   home_ = new views::ImageButton(this);
@@ skipping 23 matching lines @@
   if (ShouldShowUpgradeRecommended() || ShouldShowIncompatibilityWarning()) {
     UpdateAppMenuState();
   }
   LoadImages();
 
   // Always add children in order from left to right, for accessibility.
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
-  AddChildView(location_bar_);
   AddChildView(browser_actions_);
   AddChildView(app_menu_);
 
   location_bar_->Init(popup_parent_view);
   show_home_button_.Init(prefs::kShowHomeButton,
                          browser_->profile()->GetPrefs(), this);
   browser_actions_->Init();
 
   // Accessibility specific tooltip text.
   if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) {
@@ skipping 284 matching lines @@
 // ToolbarView, views::View overrides:
 
 gfx::Size ToolbarView::GetPreferredSize() {
   if (IsDisplayModeNormal()) {
     int min_width = kLeftEdgeSpacing +
         back_->GetPreferredSize().width() + kButtonSpacing +
         forward_->GetPreferredSize().width() + kButtonSpacing +
         reload_->GetPreferredSize().width() + kStandardSpacing +
         (show_home_button_.GetValue() ?
             (home_->GetPreferredSize().width() + kButtonSpacing) : 0) +
-        location_bar_->GetPreferredSize().width() +
+        location_bar_container_->GetPreferredSize().width() +
         browser_actions_->GetPreferredSize().width() +
         app_menu_->GetPreferredSize().width() + kRightEdgeSpacing;
 
     CR_DEFINE_STATIC_LOCAL(gfx::ImageSkia, normal_background, ());
     if (normal_background.isNull()) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       normal_background = *rb.GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
     }
 
     return gfx::Size(min_width,
                      normal_background.height() - kContentShadowHeight);
   }
 
   int vertical_spacing = PopupTopSpacing() +
       (GetWidget()->ShouldUseNativeFrame() ?
           kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass);
-  return gfx::Size(0, location_bar_->GetPreferredSize().height() +
+  return gfx::Size(0, location_bar_container_->GetPreferredSize().height() +
       vertical_spacing);
 }
 
 void ToolbarView::Layout() {
   // If we have not been initialized yet just do nothing.
   if (back_ == NULL)
     return;
 
   bool maximized = browser_->window() && browser_->window()->IsMaximized();
   if (!IsDisplayModeNormal()) {
     int edge_width = maximized ?
         0 : kPopupBackgroundEdge->width();  // See OnPaint().
-    location_bar_->SetBounds(edge_width, PopupTopSpacing(),
-        width() - (edge_width * 2), location_bar_->GetPreferredSize().height());
+    SetLocationBarContainerBounds(gfx::Rect(edge_width, PopupTopSpacing(),
+        std::max(0, width() - (edge_width * 2)),
+        location_bar_container_->GetPreferredSize().height()));
     return;
   }
 
   int child_y = std::min(kVertSpacing, height());
   // We assume all child elements are the same height.
   int child_height =
       std::min(back_->GetPreferredSize().height(), height() - child_y);
 
   // If the window is maximized, we extend the back button to the left so that
   // clicking on the left-most pixel will activate the back button.
@@ skipping 22 matching lines @@
     home_->SetVisible(false);
     home_->SetBounds(reload_->x() + reload_->width(), child_y, 0, child_height);
   }
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
   int app_menu_width = app_menu_->GetPreferredSize().width();
   int location_x = home_->x() + home_->width() + kStandardSpacing;
   int available_width = width() - kRightEdgeSpacing - app_menu_width -
       browser_actions_width - location_x;
   int location_y = std::min(location_bar_vert_spacing(), height());
-  int location_bar_height = location_bar_->GetPreferredSize().height();
+  int location_bar_height =
+      location_bar_container_->GetPreferredSize().height();
 
-  location_bar_->SetBounds(location_x, location_y, std::max(available_width, 0),
-                           location_bar_height);
+  gfx::Rect location_bar_container_bounds(
+      location_x, location_y, std::max(available_width, 0),
+      location_bar_height);
+  SetLocationBarContainerBounds(location_bar_container_bounds);
 
-  browser_actions_->SetBounds(location_bar_->x() + location_bar_->width(), 0,
+  browser_actions_->SetBounds(location_bar_container_bounds.right(), 0,
                               browser_actions_width, height());
   // The browser actions need to do a layout explicitly, because when an
   // extension is loaded/unloaded/changed, BrowserActionContainer removes and
   // re-adds everything, regardless of whether it has a page action. For a
   // page action, browser action bounds do not change, as a result of which
   // SetBounds does not do a layout at all.
   // TODO(sidchat): Rework the above behavior so that explicit layout is not
   //                required.
   browser_actions_->Layout();
 
@@ skipping 188 matching lines @@
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_->SetAccessibleName(accname_app);
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
   SchedulePaint();
 }
+
+void ToolbarView::SetLocationBarContainerBounds(
+    const gfx::Rect& bounds) {
+  if (location_bar_container_->IsAnimating())
+    return;
+
+  // LocationBarContainer is not a child of the ToolbarView.
+  gfx::Point origin(bounds.origin());
+  views::View::ConvertPointToView(this, location_bar_container_->parent(),
+                                  &origin);
+  gfx::Rect target_bounds(origin, bounds.size());
+  if (location_bar_container_->GetTargetBounds() != target_bounds)
+    location_bar_container_->SetBoundsRect(target_bounds);
+}