Remove non-md code in location bar (Views).

chrome/browser/ui/views/location_bar/content_setting_image_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/location_bar/content_setting_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
+#include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 // Time spent with animation fully open.
 const int kStayOpenTimeMS = 3200;
 }
 
 
 // static
 const int ContentSettingImageView::kAnimationDurationMS =
     (IconLabelBubbleView::kOpenTimeMS * 2) + kStayOpenTimeMS;
 
 ContentSettingImageView::ContentSettingImageView(
     ContentSettingImageModel* image_model,
     LocationBarView* parent,
-    const gfx::FontList& font_list,
-    SkColor parent_background_color)
-    : IconLabelBubbleView(0, font_list, parent_background_color, false),
+    const gfx::FontList& font_list)
+    : IconLabelBubbleView(font_list, false),
       parent_(parent),
       content_setting_image_model_(image_model),
       slide_animator_(this),
       pause_animation_(false),
       pause_animation_state_(0.0),
       bubble_view_(nullptr),
       suppress_mouse_released_action_(false) {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    SetInkDropMode(InkDropMode::ON);
-    SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
-  } else {
-    static const int kBackgroundImages[] =
-        IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);
-    SetBackgroundImageGrid(kBackgroundImages);
-    image()->set_interactive(true);
-    image()->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
-  }
-
+  SetInkDropMode(InkDropMode::ON);
+  SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   image()->SetHorizontalAlignment(base::i18n::IsRTL()
                                       ? views::ImageView::TRAILING
                                       : views::ImageView::LEADING);
   image()->EnableCanvasFlippingForRTLUI(true);
   label()->SetElideBehavior(gfx::NO_ELIDE);
   label()->SetVisible(false);
 
   slide_animator_.SetSlideDuration(kAnimationDurationMS);
   slide_animator_.SetTweenType(gfx::Tween::LINEAR);
 }
@@ skipping 80 matching lines @@
 }
 
 bool ContentSettingImageView::GetTooltipText(const gfx::Point& p,
                                              base::string16* tooltip) const {
   *tooltip = content_setting_image_model_->get_tooltip();
   return !tooltip->empty();
 }
 
 void ContentSettingImageView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
-  if (ui::MaterialDesignController::IsModeMaterial())
-    UpdateImage();
-
+  UpdateImage();
   IconLabelBubbleView::OnNativeThemeChanged(native_theme);
 }
 
 bool ContentSettingImageView::ShouldShowInkDropForFocus() const {
   return true;
 }
 
 SkColor ContentSettingImageView::GetTextColor() const {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }
 
-SkColor ContentSettingImageView::GetBorderColor() const {
-  return gfx::kGoogleYellow700;
-}
-
-bool ContentSettingImageView::ShouldShowBackground() const {
+bool ContentSettingImageView::ShouldShowLabel() const {
   return (!IsShrinking() ||
-          (width() >= MinimumWidthForImageWithBackgroundShown())) &&
+          (width() >
+           (image()->GetPreferredSize().width() +
+            2 * GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING)))) &&
          (slide_animator_.is_animating() || pause_animation_);
 }
 
 double ContentSettingImageView::WidthMultiplier() const {
   double state = pause_animation_ ? pause_animation_state_
                                   : slide_animator_.GetCurrentValue();
   // The fraction of the animation we'll spend animating the string into view,
   // which is also the fraction we'll spend animating it closed; total
   // animation (slide out, show, then slide in) is 1.0.
   const double kOpenFraction =
@@ skipping 17 matching lines @@
   if (slide_animator_.is_animating()) {
     // If the user clicks while we're animating, the bubble arrow will be
     // pointing to the image, and if we allow the animation to keep running, the
     // image will move away from the arrow (or we'll have to move the bubble,
     // which is even worse). So we want to stop the animation.  We have two
     // choices: jump to the final post-animation state (no label visible), or
     // pause the animation where we are and continue running after the bubble
     // closes. The former looks more jerky, so we avoid it unless the animation
     // hasn't even fully exposed the image yet, in which case pausing with half
     // an image visible will look broken.
-    if (!pause_animation_ && ShouldShowBackground() &&
-        (width() > MinimumWidthForImageWithBackgroundShown())) {
+    if (!pause_animation_ && ShouldShowLabel()) {
       pause_animation_ = true;
       pause_animation_state_ = slide_animator_.GetCurrentValue();
     }
     slide_animator_.Reset();
   }
 
   content::WebContents* web_contents = parent_->GetWebContents();
   if (web_contents && !bubble_view_) {
     bubble_view_ = new ContentSettingBubbleContents(
                 content_setting_image_model_->CreateBubbleModel(
                     parent_->delegate()->GetContentSettingBubbleModelDelegate(),
                     web_contents, parent_->profile()),
                 web_contents, this, views::BubbleBorder::TOP_RIGHT);
     views::Widget* bubble_widget =
         views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
     bubble_widget->AddObserver(this);
     // This is triggered by an input event. If the user clicks the icon while
     // it's not animating, the icon will be placed in an active state, so the
     // bubble doesn't need an arrow. If the user clicks during an animation,
     // the animation simply pauses and no other visible state change occurs, so
     // show the arrow in this case.
-    if (ui::MaterialDesignController::IsModeMaterial() && !pause_animation_) {
+    if (!pause_animation_) {
       AnimateInkDrop(views::InkDropState::ACTIVATED,
                      ui::LocatedEvent::FromIfValid(&event));
       bubble_view_->SetArrowPaintType(views::BubbleBorder::PAINT_TRANSPARENT);
     }
     bubble_widget->Show();
   }
 
   return true;
 }
 
@@ skipping 35 matching lines @@
 void ContentSettingImageView::OnWidgetVisibilityChanged(views::Widget* widget,
                                                         bool visible) {
   // |widget| is a bubble that has just got shown / hidden.
   if (!visible && !label()->visible())
     AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr /* event */);
 }
 
 void ContentSettingImageView::UpdateImage() {
   SetImage(content_setting_image_model_->GetIcon(GetTextColor()).AsImageSkia());
 }