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

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

Issue 21696003: views/location_bar: Eliminate TouchableLocationBarView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix wrapping 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.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
index 58e69db853210f742ba1d23b509ae3a2c5381f53..117417b5220edf4f7d6d29f45eba477c9c630aff 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
@@ -7,7 +7,6 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "chrome/browser/ui/views/location_bar/touchable_location_bar_view.h"
#include "ui/views/controls/image_view.h"
////////////////////////////////////////////////////////////////////////////////
@@ -18,8 +17,7 @@
// in the omnibox (like the bookmarks star or SSL lock).
//
////////////////////////////////////////////////////////////////////////////////
-class LocationBarDecorationView : public views::ImageView,
- public TouchableLocationBarView {
+class LocationBarDecorationView : public views::ImageView {
public:
LocationBarDecorationView();
virtual ~LocationBarDecorationView();
@@ -30,9 +28,6 @@ class LocationBarDecorationView : public views::ImageView,
virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
- // TouchableLocationBarView:
- virtual int GetBuiltInHorizontalPadding() const OVERRIDE;
-
protected:
// Whether this icon should currently be able to process a mouse click. Called
// both on mouse up and mouse down; must return true both times to for

Powered by Google App Engine
This is Rietveld 408576698