Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5384)

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc

Issue 21696003: views/location_bar: Eliminate TouchableLocationBarView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc
index 443e3685ae110994bc3cafd6bf0b55323616a814..27d0b401160319fd81449d6e923a0badf65cc8fb 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.cc
@@ -4,12 +4,13 @@
#include "chrome/browser/ui/views/location_bar/location_bar_decoration_view.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "ui/base/events/event.h"
LocationBarDecorationView::LocationBarDecorationView()
: could_handle_click_(true) {
set_accessibility_focusable(true);
- TouchableLocationBarView::Init(this);
+ LocationBarView::InitTouchableLocationBarView(this);
}
LocationBarDecorationView::~LocationBarDecorationView() {}
@@ -48,10 +49,6 @@ void LocationBarDecorationView::OnGestureEvent(ui::GestureEvent* event) {
}
}
-int LocationBarDecorationView::GetBuiltInHorizontalPadding() const {
- return GetBuiltInHorizontalPaddingImpl();
-}
-
bool LocationBarDecorationView::CanHandleClick() const {
return true;
}

Powered by Google App Engine
This is Rietveld 408576698