Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 873 const history::HistoryAddPageArgs& add_page_args, | 873 const history::HistoryAddPageArgs& add_page_args, |
| 874 NavigationType::Type navigation_type) OVERRIDE; | 874 NavigationType::Type navigation_type) OVERRIDE; |
| 875 virtual void ContentRestrictionsChanged(TabContents* source) OVERRIDE; | 875 virtual void ContentRestrictionsChanged(TabContents* source) OVERRIDE; |
| 876 virtual void RendererUnresponsive(TabContents* source) OVERRIDE; | 876 virtual void RendererUnresponsive(TabContents* source) OVERRIDE; |
| 877 virtual void RendererResponsive(TabContents* source) OVERRIDE; | 877 virtual void RendererResponsive(TabContents* source) OVERRIDE; |
| 878 virtual void WorkerCrashed(TabContents* source) OVERRIDE; | 878 virtual void WorkerCrashed(TabContents* source) OVERRIDE; |
| 879 virtual void DidNavigateMainFramePostCommit(TabContents* tab) OVERRIDE; | 879 virtual void DidNavigateMainFramePostCommit(TabContents* tab) OVERRIDE; |
| 880 virtual void DidNavigateToPendingEntry(TabContents* tab) OVERRIDE; | 880 virtual void DidNavigateToPendingEntry(TabContents* tab) OVERRIDE; |
| 881 virtual content::JavaScriptDialogCreator* | 881 virtual content::JavaScriptDialogCreator* |
| 882 GetJavaScriptDialogCreator() OVERRIDE; | 882 GetJavaScriptDialogCreator() OVERRIDE; |
| 883 virtual void EnterFullscreenModeForCurrentTab() OVERRIDE; | |
|
Peter Kasting
2011/08/11 17:53:38
I think these functions should take a TabContents*
koz (OOO until 15th September)
2011/08/15 05:50:27
Done.
| |
| 884 virtual void ExitFullscreenMode() OVERRIDE; | |
| 883 | 885 |
| 884 // Overridden from TabContentsWrapperDelegate: | 886 // Overridden from TabContentsWrapperDelegate: |
| 885 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, | 887 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, |
| 886 int32 page_id) OVERRIDE; | 888 int32 page_id) OVERRIDE; |
| 887 virtual void OnInstallApplication( | 889 virtual void OnInstallApplication( |
| 888 TabContentsWrapper* source, | 890 TabContentsWrapper* source, |
| 889 const WebApplicationInfo& app_info) OVERRIDE; | 891 const WebApplicationInfo& app_info) OVERRIDE; |
| 890 | 892 |
| 891 // Note that the caller is responsible for deleting |old_tab_contents|. | 893 // Note that the caller is responsible for deleting |old_tab_contents|. |
| 892 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, | 894 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1258 TabRestoreService* tab_restore_service_; | 1260 TabRestoreService* tab_restore_service_; |
| 1259 | 1261 |
| 1260 // Helper which implements the TabRestoreServiceDelegate interface. | 1262 // Helper which implements the TabRestoreServiceDelegate interface. |
| 1261 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 1263 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
| 1262 | 1264 |
| 1263 scoped_ptr<InstantController> instant_; | 1265 scoped_ptr<InstantController> instant_; |
| 1264 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1266 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1265 | 1267 |
| 1266 BookmarkBar::State bookmark_bar_state_; | 1268 BookmarkBar::State bookmark_bar_state_; |
| 1267 | 1269 |
| 1270 // True if the browser is in fullscreen mode for a particular tab. | |
| 1271 bool fullscreen_for_tab_; | |
| 1272 | |
| 1268 DISALLOW_COPY_AND_ASSIGN(Browser); | 1273 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1269 }; | 1274 }; |
| 1270 | 1275 |
| 1271 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1276 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |