Remove touch layout

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/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 60 matching lines @@
   // alpha. This is because AlphaBlend(a, b, 255) always returns |a| unchanged
   // even if |a| is a color with non-255 alpha.
   text_label_->SetBackgroundColor(
       color_utils::AlphaBlend(SkColorSetA(background_image_color, 255),
                               parent_background_color,
                               SkColorGetA(background_image_color)));
   text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   text_label_->SetElideBehavior(views::Label::NO_ELIDE);
   AddChildView(text_label_);
 
-  LocationBarView::InitTouchableLocationBarChildView(this);
-
   slide_animator_.SetSlideDuration(kAnimationDurationMS);
   slide_animator_.SetTweenType(gfx::Tween::LINEAR);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_widget_)
     bubble_widget_->RemoveObserver(this);
 }
 
 void ContentSettingImageView::Update(content::WebContents* web_contents) {
@@ skipping 29 matching lines @@
     text_label_->SetVisible(true);
     slide_animator_.Show();
   }
 
   content_settings->SetBlockageHasBeenIndicated(
       content_setting_image_model_->get_content_settings_type());
 }
 
 // static
 int ContentSettingImageView::GetBubbleOuterPadding(bool by_icon) {
-  return LocationBarView::GetItemPadding() - LocationBarView::kBubblePadding +
+  return LocationBarView::kItemPadding - LocationBarView::kBubblePadding +
       (by_icon ? 0 : LocationBarView::kIconInternalPadding);
 }
 
 void ContentSettingImageView::AnimationEnded(const gfx::Animation* animation) {
   slide_animator_.Reset();
   if (!pause_animation_) {
     text_label_->SetVisible(false);
     parent_->Layout();
     parent_->SchedulePaint();
   }
@@ skipping 34 matching lines @@
   }
   return size;
 }
 
 void ContentSettingImageView::Layout() {
   const int icon_width = icon_->GetPreferredSize().width();
   icon_->SetBounds(
       std::min((width() - icon_width) / 2, GetBubbleOuterPadding(true)), 0,
       icon_width, height());
   text_label_->SetBounds(
-      icon_->bounds().right() + LocationBarView::GetItemPadding(), 0,
+      icon_->bounds().right() + LocationBarView::kItemPadding, 0,
       std::max(width() - GetTotalSpacingWhileAnimating() - icon_width, 0),
       height());
 }
 
 bool ContentSettingImageView::OnMousePressed(const ui::MouseEvent& event) {
   // We want to show the bubble on mouse release; that is the standard behavior
   // for buttons.
   return true;
 }
 
@@ skipping 21 matching lines @@
   bubble_widget_ = NULL;
 
   if (pause_animation_) {
     slide_animator_.Reset(pause_animation_state_);
     pause_animation_ = false;
     slide_animator_.Show();
   }
 }
 
 int ContentSettingImageView::GetTotalSpacingWhileAnimating() const {
-  return GetBubbleOuterPadding(true) + LocationBarView::GetItemPadding() +
+  return GetBubbleOuterPadding(true) + LocationBarView::kItemPadding +
       GetBubbleOuterPadding(false);
 }
 
 void ContentSettingImageView::OnClick() {
   if (slide_animator_.is_animating()) {
     if (!pause_animation_) {
       pause_animation_ = true;
       pause_animation_state_ = slide_animator_.GetCurrentValue();
     }
     slide_animator_.Reset();
   }
 
   content::WebContents* web_contents = parent_->GetWebContents();
   if (web_contents && !bubble_widget_) {
     bubble_widget_ =
         parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(
             ContentSettingBubbleModel::CreateContentSettingBubbleModel(
                 parent_->delegate()->GetContentSettingBubbleModelDelegate(),
                 web_contents, parent_->profile(),
                 content_setting_image_model_->get_content_settings_type()),
             this, views::BubbleBorder::TOP_RIGHT));
     bubble_widget_->AddObserver(this);
     bubble_widget_->Show();
   }
 }