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

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

Issue 1428423002: Remove setVoiceSearchSupported part of EmbeddedSearch SearchBox API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 9d4d1bccaf6995460c37879cbcea47259afd2a23..e745af3b797919bbcc0912e01890a8e6380c57e1 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -14,7 +14,6 @@
#include "chrome/browser/ssl/security_state_model.h"
#include "chrome/browser/ui/location_bar/location_bar.h"
#include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
-#include "chrome/browser/ui/search/search_model_observer.h"
#include "chrome/browser/ui/toolbar/chrome_toolbar_model.h"
#include "chrome/browser/ui/views/dropdown_bar_host.h"
#include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
@@ -26,7 +25,6 @@
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/font.h"
#include "ui/gfx/geometry/rect.h"
-#include "ui/views/controls/button/button.h"
#include "ui/views/drag_controller.h"
class ActionBoxButtonView;
@@ -73,13 +71,11 @@ class Widget;
class LocationBarView : public LocationBar,
public LocationBarTesting,
public views::View,
- public views::ButtonListener,
public views::DragController,
public gfx::AnimationDelegate,
public ChromeOmniboxEditController,
public DropdownBarHostDelegate,
public TemplateURLServiceObserver,
- public SearchModelObserver,
public ui_zoom::ZoomEventManagerObserver {
public:
// The location bar view's class name.
@@ -374,9 +370,6 @@ class LocationBarView : public LocationBar,
void OnPaint(gfx::Canvas* canvas) override;
void PaintChildren(const ui::PaintContext& context) override;
- // views::ButtonListener:
- void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
// views::DragController:
void WriteDragDataForView(View* sender,
const gfx::Point& press_pt,
@@ -402,10 +395,6 @@ class LocationBarView : public LocationBar,
// TemplateURLServiceObserver:
void OnTemplateURLServiceChanged() override;
- // SearchModelObserver:
- void ModelChanged(const SearchModel::State& old_state,
- const SearchModel::State& new_state) override;
-
// The Browser this LocationBarView is in. Note that at least
// chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser
// window, so this may be NULL.
@@ -447,9 +436,6 @@ class LocationBarView : public LocationBar,
// Shown if the selected url has a corresponding keyword.
KeywordHintView* keyword_hint_view_;
- // The voice search icon.
- views::ImageButton* mic_search_view_;
-
// The content setting views.
ContentSettingViews content_setting_views_;

Powered by Google App Engine
This is Rietveld 408576698