| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/gtest_prod_util.h" | 15 #include "base/gtest_prod_util.h" |
| 16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
| 18 #include "base/prefs/pref_change_registrar.h" | 18 #include "base/prefs/pref_change_registrar.h" |
| 19 #include "base/prefs/pref_member.h" | 19 #include "base/prefs/pref_member.h" |
| 20 #include "base/scoped_observer.h" | 20 #include "base/scoped_observer.h" |
| 21 #include "base/strings/string16.h" | 21 #include "base/strings/string16.h" |
| 22 #include "chrome/browser/devtools/devtools_toggle_action.h" | 22 #include "chrome/browser/devtools/devtools_toggle_action.h" |
| 23 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 23 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
| 24 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" | 24 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |
| 25 #include "chrome/browser/ui/browser_navigator.h" | 25 #include "chrome/browser/ui/browser_navigator.h" |
| 26 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" | 26 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" |
| 27 #include "chrome/browser/ui/exclusive_access/exclusive_access_controller_manager
.h" |
| 27 #include "chrome/browser/ui/host_desktop.h" | 28 #include "chrome/browser/ui/host_desktop.h" |
| 28 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" | 29 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" |
| 29 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 30 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
| 30 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 31 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 31 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 32 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 32 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 33 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 33 #include "components/content_settings/core/common/content_settings.h" | 34 #include "components/content_settings/core/common/content_settings.h" |
| 34 #include "components/content_settings/core/common/content_settings_types.h" | 35 #include "components/content_settings/core/common/content_settings_types.h" |
| 35 #include "components/sessions/session_id.h" | 36 #include "components/sessions/session_id.h" |
| 36 #include "components/ui/zoom/zoom_observer.h" | 37 #include "components/ui/zoom/zoom_observer.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 50 #endif | 51 #endif |
| 51 | 52 |
| 52 class BrowserContentSettingBubbleModelDelegate; | 53 class BrowserContentSettingBubbleModelDelegate; |
| 53 class BrowserContentTranslateDriverObserver; | 54 class BrowserContentTranslateDriverObserver; |
| 54 class BrowserInstantController; | 55 class BrowserInstantController; |
| 55 class BrowserSyncedWindowDelegate; | 56 class BrowserSyncedWindowDelegate; |
| 56 class BrowserToolbarModelDelegate; | 57 class BrowserToolbarModelDelegate; |
| 57 class BrowserTabRestoreServiceDelegate; | 58 class BrowserTabRestoreServiceDelegate; |
| 58 class BrowserWindow; | 59 class BrowserWindow; |
| 59 class FindBarController; | 60 class FindBarController; |
| 60 class FullscreenController; | |
| 61 class PrefService; | 61 class PrefService; |
| 62 class Profile; | 62 class Profile; |
| 63 class SearchDelegate; | 63 class SearchDelegate; |
| 64 class SearchModel; | 64 class SearchModel; |
| 65 class StatusBubble; | 65 class StatusBubble; |
| 66 class TabStripModel; | 66 class TabStripModel; |
| 67 class TabStripModelDelegate; | 67 class TabStripModelDelegate; |
| 68 struct WebApplicationInfo; | 68 struct WebApplicationInfo; |
| 69 | 69 |
| 70 namespace chrome { | 70 namespace chrome { |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 | 468 |
| 469 // Called each time the browser window is shown. | 469 // Called each time the browser window is shown. |
| 470 void OnWindowDidShow(); | 470 void OnWindowDidShow(); |
| 471 | 471 |
| 472 // Show the first run search engine bubble on the location bar. | 472 // Show the first run search engine bubble on the location bar. |
| 473 void ShowFirstRunBubble(); | 473 void ShowFirstRunBubble(); |
| 474 | 474 |
| 475 // Show a download on the download shelf. | 475 // Show a download on the download shelf. |
| 476 void ShowDownload(content::DownloadItem* download); | 476 void ShowDownload(content::DownloadItem* download); |
| 477 | 477 |
| 478 FullscreenController* fullscreen_controller() const { | 478 ExclusiveAccessControllerManager* GetExclusiveAccessControllerManager() |
| 479 return fullscreen_controller_.get(); | 479 const { |
| 480 return exclusive_access_controller_manager_.get(); |
| 480 } | 481 } |
| 481 | 482 |
| 482 extensions::WindowController* extension_window_controller() const { | 483 extensions::WindowController* extension_window_controller() const { |
| 483 return extension_window_controller_.get(); | 484 return extension_window_controller_.get(); |
| 484 } | 485 } |
| 485 | 486 |
| 486 private: | 487 private: |
| 487 friend class BrowserTest; | 488 friend class BrowserTest; |
| 488 friend class FullscreenControllerInteractiveTest; | 489 friend class FullscreenControllerInteractiveTest; |
| 489 friend class FullscreenControllerTest; | 490 friend class FullscreenControllerTest; |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 946 // Helper which implements the TabRestoreServiceDelegate interface. | 947 // Helper which implements the TabRestoreServiceDelegate interface. |
| 947 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 948 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
| 948 | 949 |
| 949 // Helper which implements the SyncedWindowDelegate interface. | 950 // Helper which implements the SyncedWindowDelegate interface. |
| 950 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; | 951 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; |
| 951 | 952 |
| 952 scoped_ptr<BrowserInstantController> instant_controller_; | 953 scoped_ptr<BrowserInstantController> instant_controller_; |
| 953 | 954 |
| 954 BookmarkBar::State bookmark_bar_state_; | 955 BookmarkBar::State bookmark_bar_state_; |
| 955 | 956 |
| 956 scoped_ptr<FullscreenController> fullscreen_controller_; | 957 scoped_ptr<ExclusiveAccessControllerManager> |
| 958 exclusive_access_controller_manager_; |
| 957 | 959 |
| 958 scoped_ptr<extensions::WindowController> extension_window_controller_; | 960 scoped_ptr<extensions::WindowController> extension_window_controller_; |
| 959 | 961 |
| 960 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 962 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
| 961 | 963 |
| 962 // True if the browser window has been shown at least once. | 964 // True if the browser window has been shown at least once. |
| 963 bool window_has_shown_; | 965 bool window_has_shown_; |
| 964 | 966 |
| 965 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 967 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
| 966 | 968 |
| 967 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 969 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 968 | 970 |
| 969 // The following factory is used for chrome update coalescing. | 971 // The following factory is used for chrome update coalescing. |
| 970 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 972 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 971 | 973 |
| 972 // The following factory is used to close the frame at a later time. | 974 // The following factory is used to close the frame at a later time. |
| 973 base::WeakPtrFactory<Browser> weak_factory_; | 975 base::WeakPtrFactory<Browser> weak_factory_; |
| 974 | 976 |
| 975 DISALLOW_COPY_AND_ASSIGN(Browser); | 977 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 976 }; | 978 }; |
| 977 | 979 |
| 978 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 980 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |