| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index 7f851351abc0f36fe118305b0567dc71a551a7f1..68d48e7a531fb50b3cacfbef623b5484eef90731 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -29,6 +29,7 @@
|
| #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_model.h"
|
| +#include "chrome/browser/ui/web_applications/hosted_app_tab_helper_delegate.h"
|
| #include "chrome/browser/ui/zoom/zoom_observer.h"
|
| #include "chrome/common/content_settings.h"
|
| #include "chrome/common/content_settings_types.h"
|
| @@ -99,6 +100,7 @@ class Browser : public TabStripModelObserver,
|
| public SearchEngineTabHelperDelegate,
|
| public ChromeWebModalDialogManagerDelegate,
|
| public BookmarkTabHelperDelegate,
|
| + public HostedAppTabHelperDelegate,
|
| public ZoomObserver,
|
| public content::PageNavigator,
|
| public content::NotificationObserver,
|
| @@ -281,9 +283,6 @@ class Browser : public TabStripModelObserver,
|
|
|
| // State Storage and Retrieval for UI ///////////////////////////////////////
|
|
|
| - // Gets the Favicon of the page in the selected tab.
|
| - gfx::Image GetCurrentPageIcon() const;
|
| -
|
| // Gets the title of the window based on the selected tab's title.
|
| string16 GetWindowTitleForCurrentTab() const;
|
|
|
| @@ -679,6 +678,9 @@ class Browser : public TabStripModelObserver,
|
| virtual void URLStarredChanged(content::WebContents* web_contents,
|
| bool starred) OVERRIDE;
|
|
|
| + // Overriden from HostedAppTabHelper:
|
| + virtual void OnWindowIconLoaded(content::WebContents* source) OVERRIDE;
|
| +
|
| // Overridden from ZoomObserver:
|
| virtual void OnZoomChanged(content::WebContents* source,
|
| bool can_show_bubble) OVERRIDE;
|
|
|