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..7bea9fc827a6b3e926583b91bcf741e07428a3f7 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,7 @@ void LocationIconView::OnGestureEvent(ui::GestureEvent* event) {
   }
 }
 
-int LocationIconView::GetBuiltInHorizontalPadding() const {
-  return GetBuiltInHorizontalPaddingImpl();
-}
-
 void LocationIconView::ShowTooltip(bool show) {
-  if (show) {
-    SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON));
-  } else {
-    SetTooltipText(string16());
-  }
+  SetTooltipText(show ? l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON)
+                      : base::string16());

[Peter Kasting, 2013/08/09 20:57:28]

Nit: Break after '?' (as my comment had it), not before ':'.

[tfarina, 2013/08/10 02:13:40]

this is clang-format not me.

 }