views/location_bar: Eliminate TouchableLocationBarView.

chrome/browser/ui/views/location_bar/location_icon_view.cc

Index: chrome/browser/ui/views/location_bar/location_icon_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
index 1772e91ffe91ae0971c173152b0680611261a0c9..59791a58dd031050005b303b480673174e28da79 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -5,13 +5,14 @@
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 LocationIconView::LocationIconView(LocationBarView* location_bar)
     : page_info_helper_(this, location_bar) {
   SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON));
-  TouchableLocationBarView::Init(this);
+  LocationBarView::InitTouchableLocationBarView(this);
 }
 
 LocationIconView::~LocationIconView() {
@@ -34,14 +35,9 @@ void LocationIconView::OnGestureEvent(ui::GestureEvent* event) {
   }
 }
 
-int LocationIconView::GetBuiltInHorizontalPadding() const {
-  return GetBuiltInHorizontalPaddingImpl();
-}
-
 void LocationIconView::ShowTooltip(bool show) {
-  if (show) {
+  if (show)

[Peter Kasting, 2013/08/06 20:32:42]

Nit: Simpler:

  SetTooltipText(show ?
      l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON) : string16());

     SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON));
-  } else {
+  else
     SetTooltipText(string16());
-  }
 }