| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index 05a74418895e9d46d228e47423b33a73e8730547..c4c53756ec0cc588d1d3c100d85123878eb61c2c 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -40,6 +40,7 @@
|
| #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_model.h"
|
| #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
|
| +#include "chrome/browser/ui/zoom/zoom_observer.h"
|
| #include "chrome/common/content_settings.h"
|
| #include "chrome/common/content_settings_types.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| @@ -98,6 +99,7 @@ class Browser : public TabStripModelDelegate,
|
| public ConstrainedWindowTabHelperDelegate,
|
| public BlockedContentTabHelperDelegate,
|
| public BookmarkTabHelperDelegate,
|
| + public ZoomObserver,
|
| public ExtensionTabHelperDelegate,
|
| public content::PageNavigator,
|
| public CommandUpdater::CommandUpdaterDelegate,
|
| @@ -1019,6 +1021,13 @@ class Browser : public TabStripModelDelegate,
|
| virtual void URLStarredChanged(TabContentsWrapper* source,
|
| bool starred) OVERRIDE;
|
|
|
| + // Overridden from ZoomObserver:
|
| + virtual void OnZoomIconChanged(TabContentsWrapper* source,
|
| + ZoomController::ZoomIconState state) OVERRIDE;
|
| + virtual void OnZoomChanged(TabContentsWrapper* source,
|
| + int zoom_percent,
|
| + bool can_show_bubble) OVERRIDE;
|
| +
|
| // Overridden from ExtensionTabHelperDelegate:
|
| virtual void OnDidGetApplicationInfo(TabContentsWrapper* source,
|
| int32 page_id) OVERRIDE;
|
|
|