| 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 d0eb7702f925e608ce2445f3f18f1eb79a8f29fd..84e6972229a8fc460a39563e42cbc619b5a86461 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| @@ -19,6 +19,7 @@
|
| #include "chrome/browser/ui/views/dropdown_bar_host.h"
|
| #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
|
| #include "chrome/browser/ui/views/extensions/extension_popup.h"
|
| +#include "chrome/browser/ui/views/location_bar/action_box_button_view.h"
|
| #include "chrome/browser/ui/zoom/zoom_controller.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| @@ -79,7 +80,8 @@ class LocationBarView : public LocationBar,
|
| public DropdownBarHostDelegate,
|
| public chrome::search::SearchModelObserver,
|
| public TemplateURLServiceObserver,
|
| - public content::NotificationObserver {
|
| + public content::NotificationObserver,
|
| + public ActionBoxButtonView::Delegate {
|
| public:
|
| // The location bar view's class name.
|
| static const char kViewClassName[];
|
| @@ -370,6 +372,9 @@ class LocationBarView : public LocationBar,
|
| friend class PageActionWithBadgeView;
|
| typedef std::vector<PageActionWithBadgeView*> PageActionViews;
|
|
|
| + // Overridden from ActionBoxButtonView::Delegate
|
| + virtual Browser* GetBrowser() const;
|
| +
|
| #if defined(USE_AURA)
|
| // Observer that informs the LocationBarView when the animation is done.
|
| class FadeAnimationObserver : public ui::ImplicitAnimationObserver {
|
|
|