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 0b17ae7c3c3810c8f6605e316edc2f844227c1fd..ebd575526bab74a1bcefd47a237391d429f1a1cc 100644 |
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h |
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h |
@@ -14,6 +14,7 @@ |
#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" |
@@ -25,6 +26,7 @@ |
#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; |
@@ -54,6 +56,8 @@ |
namespace views { |
class BubbleDelegateView; |
+class ImageButton; |
+class ImageView; |
class Label; |
class Widget; |
} |
@@ -69,11 +73,13 @@ |
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. |
@@ -367,6 +373,9 @@ |
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, |
@@ -392,6 +401,10 @@ |
// 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. |
@@ -433,6 +446,9 @@ |
// 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_; |