Remove origin chip v1 and "hide on input" v2 behavior.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar_view.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/translate_icon_view.h"
 #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/back_button.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/home_button.h"
 #include "chrome/browser/ui/views/toolbar/reload_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
-#include "chrome/browser/ui/views/toolbar/toolbar_origin_chip_view.h"
 #include "chrome/browser/ui/views/toolbar/wrench_menu.h"
 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_switches.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/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 70 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
 ToolbarView::ToolbarView(Browser* browser)
     : back_(NULL),
       forward_(NULL),
       reload_(NULL),
       home_(NULL),
       location_bar_(NULL),
-      origin_chip_view_(NULL),
       browser_actions_(NULL),
       app_menu_(NULL),
       browser_(browser),
       extension_message_bubble_factory_(
           new extensions::ExtensionMessageBubbleFactory(browser->profile(),
                                                         this)) {
   set_id(VIEW_ID_TOOLBAR);
 
   chrome::AddCommandObserver(browser_, IDC_BACK, this);
   chrome::AddCommandObserver(browser_, IDC_FORWARD, this);
@@ skipping 83 matching lines @@
   browser_actions_ = new BrowserActionsContainer(browser_, this);
 
   app_menu_ = new WrenchToolbarButton(this);
   app_menu_->SetBorder(views::Border::NullBorder());
   app_menu_->EnableCanvasFlippingForRTLUI(true);
   app_menu_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP));
   app_menu_->SetTooltipText(l10n_util::GetStringUTF16(IDS_APPMENU_TOOLTIP));
   app_menu_->set_id(VIEW_ID_APP_MENU);
 
   // Always add children in order from left to right, for accessibility.
-  origin_chip_view_ = new ToolbarOriginChipView(this);
-  chrome::OriginChipPosition origin_chip_position =
-      chrome::GetOriginChipPosition();
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
-  if (origin_chip_position == chrome::ORIGIN_CHIP_LEADING_LOCATION_BAR)
-    AddChildView(origin_chip_view_);
   AddChildView(location_bar_);
-  if (origin_chip_position == chrome::ORIGIN_CHIP_TRAILING_LOCATION_BAR)
-    AddChildView(origin_chip_view_);
   AddChildView(browser_actions_);
-  if (origin_chip_position == chrome::ORIGIN_CHIP_LEADING_MENU_BUTTON ||
-      origin_chip_position == chrome::ORIGIN_CHIP_DISABLED)
-    AddChildView(origin_chip_view_);
   AddChildView(app_menu_);
 
   LoadImages();
 
   // Start global error services now so we badge the menu correctly in non-Ash.
 #if !defined(OS_CHROMEOS)
   if (!HasAshShell()) {
     SigninGlobalErrorFactory::GetForProfile(browser_->profile());
 #if !defined(OS_ANDROID)
     SyncGlobalErrorFactory::GetForProfile(browser_->profile());
 #endif
   }
 #endif  // OS_CHROMEOS
 
   // Add any necessary badges to the menu item based on the system state.
   // Do this after |app_menu_| has been added as a bubble may be shown that
   // needs the widget (widget found by way of app_menu_->GetWidget()).
   UpdateAppMenuState();
 
   location_bar_->Init();
 
-  origin_chip_view_->Init();
-  if (origin_chip_view_->ShouldShow())
-    location_bar_->set_toolbar_origin_chip_view(origin_chip_view_);
-
   show_home_button_.Init(prefs::kShowHomeButton,
                          browser_->profile()->GetPrefs(),
                          base::Bind(&ToolbarView::OnShowHomeButtonChanged,
                                     base::Unretained(this)));
 
   browser_actions_->Init();
 
   // Accessibility specific tooltip text.
   if (content::BrowserAccessibilityState::GetInstance()->
           IsAccessibleBrowser()) {
     back_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK));
     forward_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD));
   }
 }
 
 void ToolbarView::OnWidgetVisibilityChanged(views::Widget* widget,
                                             bool visible) {
   // Safe to call multiple times; the bubble will only appear once.
   if (visible)
     extension_message_bubble_factory_->MaybeShow(app_menu_);
 }
 
 void ToolbarView::Update(WebContents* tab) {
   if (location_bar_)
     location_bar_->Update(tab);
-  if (origin_chip_view_->visible())
-    origin_chip_view_->Update(tab);
-
   if (browser_actions_)
     browser_actions_->RefreshBrowserActionViews();
-
   if (reload_)
     reload_->set_menu_enabled(chrome::IsDebuggerAttachedToCurrentTab(browser_));
 }
 
 void ToolbarView::SetPaneFocusAndFocusAppMenu() {
   SetPaneFocus(app_menu_);
 }
 
 bool ToolbarView::IsAppMenuFocused() {
   return app_menu_->HasFocus();
@@ skipping 215 matching lines @@
 
 gfx::Size ToolbarView::GetPreferredSize() {
   gfx::Size size(location_bar_->GetPreferredSize());
   if (is_display_mode_normal()) {
     size.Enlarge(
         kLeftEdgeSpacing + back_->GetPreferredSize().width() +
             forward_->GetPreferredSize().width() +
             reload_->GetPreferredSize().width() + kStandardSpacing +
             (show_home_button_.GetValue() ?
                 home_->GetPreferredSize().width() : 0) +
-            (origin_chip_view_->visible() ?
-                (origin_chip_view_->GetPreferredSize().width() +
-                    2 * kStandardSpacing) :
-                0) +
             browser_actions_->GetPreferredSize().width() +
             app_menu_->GetPreferredSize().width() + kRightEdgeSpacing,
         0);
     gfx::ImageSkia* normal_background =
         GetThemeProvider()->GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
     size.SetToMax(
         gfx::Size(0, normal_background->height() - content_shadow_height()));
   } else {
     const int kPopupBottomSpacingGlass = 1;
     const int kPopupBottomSpacingNonGlass = 2;
@@ skipping 58 matching lines @@
     home_->SetVisible(false);
     home_->SetBounds(next_element_x, child_y, 0, child_height);
   }
   next_element_x = home_->bounds().right() + kStandardSpacing;
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
   int app_menu_width = app_menu_->GetPreferredSize().width();
   int available_width = std::max(0, width() - kRightEdgeSpacing -
       app_menu_width - browser_actions_width - next_element_x);
 
-  origin_chip_view_->SetVisible(origin_chip_view_->ShouldShow());
-  int origin_chip_width =
-      origin_chip_view_->ElideDomainTarget(available_width / 2);
-  if (origin_chip_view_->visible())
-    available_width -= origin_chip_width + kStandardSpacing;
-
-  chrome::OriginChipPosition origin_chip_position =
-      chrome::GetOriginChipPosition();
-  if (origin_chip_view_->visible() &&
-      origin_chip_position == chrome::ORIGIN_CHIP_LEADING_LOCATION_BAR) {
-    origin_chip_view_->SetBounds(next_element_x, child_y,
-                                 origin_chip_width, child_height);
-    next_element_x = origin_chip_view_->bounds().right() + kStandardSpacing;
-  }
-
   int location_height = location_bar_->GetPreferredSize().height();
   int location_y = (height() - location_height + 1) / 2;
   location_bar_->SetBounds(next_element_x, location_y,
                            std::max(available_width, 0), location_height);
   next_element_x = location_bar_->bounds().right();
 
-  if (origin_chip_view_->visible() &&
-      origin_chip_position == chrome::ORIGIN_CHIP_TRAILING_LOCATION_BAR) {
-    origin_chip_view_->SetBounds(next_element_x + kStandardSpacing, child_y,
-                                 origin_chip_width, child_height);
-    next_element_x = origin_chip_view_->bounds().right();
-  }
-
   browser_actions_->SetBounds(
       next_element_x, child_y, browser_actions_width, child_height);
   next_element_x = browser_actions_->bounds().right();
 
   // 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();
 
-  if (origin_chip_view_->visible() &&
-      origin_chip_position == chrome::ORIGIN_CHIP_LEADING_MENU_BUTTON) {
-    origin_chip_view_->SetBounds(next_element_x, child_y,
-                                 origin_chip_width, child_height);
-    next_element_x = origin_chip_view_->bounds().right() + kStandardSpacing;
-  }
-
   // Extend the app menu to the screen's right edge in maximized mode just like
   // we extend the back button to the left edge.
   if (maximized)
     app_menu_width += kRightEdgeSpacing;
   app_menu_->SetBounds(next_element_x, child_y, app_menu_width, child_height);
 }
 
 bool ToolbarView::HitTestRect(const gfx::Rect& rect) const {
   // Fall through to the tab strip above us if none of |rect| intersects
   // with this view (intersection with the top shadow edge does not
@@ skipping 187 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }