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

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

Issue 21696003: views/location_bar: Eliminate TouchableLocationBarView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/mic_search_view.cc
diff --git a/chrome/browser/ui/views/location_bar/mic_search_view.cc b/chrome/browser/ui/views/location_bar/mic_search_view.cc
index 31f67d622015bb5280cd0dc818204ddd72450781..6d1ac73a5a455a6a07645fc212ce8ac07f977e3d 100644
--- a/chrome/browser/ui/views/location_bar/mic_search_view.cc
+++ b/chrome/browser/ui/views/location_bar/mic_search_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/location_bar/mic_search_view.h"
#include "chrome/browser/ui/view_ids.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/accessibility/accessible_view_state.h"
@@ -20,12 +21,8 @@ MicSearchView::MicSearchView(views::ButtonListener* button_listener)
ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_OMNIBOX_MIC_SEARCH));
SetImageAlignment(ALIGN_CENTER, ALIGN_MIDDLE);
- TouchableLocationBarView::Init(this);
+ LocationBarView::InitTouchableLocationBarView(this);
}
MicSearchView::~MicSearchView() {
}
-
-int MicSearchView::GetBuiltInHorizontalPadding() const {
- return GetBuiltInHorizontalPaddingImpl();
-}

Powered by Google App Engine
This is Rietveld 408576698