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 ToggleFullscreenModeForRVH(TabContents* tab, | |
Peter Kasting
2011/08/15 22:42:54
Nit: Since this function takes a TabContents*, it
koz (OOO until 15th September)
2011/08/16 07:06:55
Done.
| |
884 bool enter_fullscreen) 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1119 | 1121 |
1120 // Retrieves the content restrictions for the currently selected tab. | 1122 // Retrieves the content restrictions for the currently selected tab. |
1121 // Returns 0 if no tab selected, which is equivalent to no content | 1123 // Returns 0 if no tab selected, which is equivalent to no content |
1122 // restrictions active. | 1124 // restrictions active. |
1123 int GetContentRestrictionsForSelectedTab(); | 1125 int GetContentRestrictionsForSelectedTab(); |
1124 | 1126 |
1125 // Resets |bookmark_bar_state_| based on the active tab. Notifies the | 1127 // Resets |bookmark_bar_state_| based on the active tab. Notifies the |
1126 // BrowserWindow if necessary. | 1128 // BrowserWindow if necessary. |
1127 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); | 1129 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); |
1128 | 1130 |
1131 // Make the current tab exit fullscreen mode. If the browser was fullscreen | |
1132 // because of that (as opposed to the user clicking the fullscreen button) | |
1133 // then take the browser out of fullscreen mode as well. | |
1134 void ExitTabbedFullscreenMode(); | |
Peter Kasting
2011/08/15 22:42:54
Nit: I think adding "IfNecessary" to both these fu
koz (OOO until 15th September)
2011/08/16 07:06:55
Done.
| |
1135 | |
1136 // Notifies the tab that it has been forced out of fullscreen mode. | |
1137 void NotifyTabOfFullscreenExit(); | |
1138 | |
1129 // Data members ///////////////////////////////////////////////////////////// | 1139 // Data members ///////////////////////////////////////////////////////////// |
1130 | 1140 |
1131 NotificationRegistrar registrar_; | 1141 NotificationRegistrar registrar_; |
1132 | 1142 |
1133 PrefChangeRegistrar profile_pref_registrar_; | 1143 PrefChangeRegistrar profile_pref_registrar_; |
1134 | 1144 |
1135 PrefChangeRegistrar local_pref_registrar_; | 1145 PrefChangeRegistrar local_pref_registrar_; |
1136 | 1146 |
1137 // This Browser's type. | 1147 // This Browser's type. |
1138 const Type type_; | 1148 const Type type_; |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1258 TabRestoreService* tab_restore_service_; | 1268 TabRestoreService* tab_restore_service_; |
1259 | 1269 |
1260 // Helper which implements the TabRestoreServiceDelegate interface. | 1270 // Helper which implements the TabRestoreServiceDelegate interface. |
1261 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 1271 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
1262 | 1272 |
1263 scoped_ptr<InstantController> instant_; | 1273 scoped_ptr<InstantController> instant_; |
1264 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1274 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1265 | 1275 |
1266 BookmarkBar::State bookmark_bar_state_; | 1276 BookmarkBar::State bookmark_bar_state_; |
1267 | 1277 |
1278 // Whether the current tab should be notified if the browser exits | |
1279 // fullscreen. | |
1280 bool notify_tab_of_fullscreen_exit_; | |
1281 | |
1282 // True if the current tab is in fullscreen mode. | |
1283 bool tab_caused_fullscreen_; | |
1284 | |
1268 DISALLOW_COPY_AND_ASSIGN(Browser); | 1285 DISALLOW_COPY_AND_ASSIGN(Browser); |
1269 }; | 1286 }; |
1270 | 1287 |
1271 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1288 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |