Chromium Code Reviews| Index: chrome/browser/ui/browser.h |
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h |
| index 7f851351abc0f36fe118305b0567dc71a551a7f1..9fd9cc92380b0b973bee8ff339a0d653018ce2ff 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, |
| @@ -282,7 +284,7 @@ class Browser : public TabStripModelObserver, |
| // State Storage and Retrieval for UI /////////////////////////////////////// |
| // Gets the Favicon of the page in the selected tab. |
| - gfx::Image GetCurrentPageIcon() const; |
| + const gfx::Image GetCurrentPageIcon(int icon_size) const; |
|
tapted
2013/11/11 08:52:57
nit: non-reference `const` return types aren't usu
calamity
2013/11/13 06:37:14
Done.
|
| // Gets the title of the window based on the selected tab's title. |
| string16 GetWindowTitleForCurrentTab() const; |
| @@ -679,6 +681,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; |