| 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> |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 class UnloadController; | 74 class UnloadController; |
| 75 } | 75 } |
| 76 | 76 |
| 77 namespace content { | 77 namespace content { |
| 78 class NavigationController; | 78 class NavigationController; |
| 79 class PageState; | 79 class PageState; |
| 80 class SessionStorageNamespace; | 80 class SessionStorageNamespace; |
| 81 } | 81 } |
| 82 | 82 |
| 83 namespace extensions { | 83 namespace extensions { |
| 84 class BookmarkAppBrowserController; | 84 class HostedAppBrowserController; |
| 85 class Extension; | 85 class Extension; |
| 86 class ExtensionRegistry; | 86 class ExtensionRegistry; |
| 87 class WindowController; | 87 class WindowController; |
| 88 } | 88 } |
| 89 | 89 |
| 90 namespace gfx { | 90 namespace gfx { |
| 91 class Image; | 91 class Image; |
| 92 class Point; | 92 class Point; |
| 93 } | 93 } |
| 94 | 94 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 } | 276 } |
| 277 BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() { | 277 BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() { |
| 278 return tab_restore_service_delegate_.get(); | 278 return tab_restore_service_delegate_.get(); |
| 279 } | 279 } |
| 280 BrowserSyncedWindowDelegate* synced_window_delegate() { | 280 BrowserSyncedWindowDelegate* synced_window_delegate() { |
| 281 return synced_window_delegate_.get(); | 281 return synced_window_delegate_.get(); |
| 282 } | 282 } |
| 283 BrowserInstantController* instant_controller() { | 283 BrowserInstantController* instant_controller() { |
| 284 return instant_controller_.get(); | 284 return instant_controller_.get(); |
| 285 } | 285 } |
| 286 extensions::BookmarkAppBrowserController* bookmark_app_controller() { | 286 extensions::HostedAppBrowserController* hosted_app_controller() { |
| 287 return bookmark_app_controller_.get(); | 287 return hosted_app_controller_.get(); |
| 288 } | 288 } |
| 289 | 289 |
| 290 // Get the FindBarController for this browser, creating it if it does not | 290 // Get the FindBarController for this browser, creating it if it does not |
| 291 // yet exist. | 291 // yet exist. |
| 292 FindBarController* GetFindBarController(); | 292 FindBarController* GetFindBarController(); |
| 293 | 293 |
| 294 // Returns true if a FindBarController exists for this browser. | 294 // Returns true if a FindBarController exists for this browser. |
| 295 bool HasFindBarController() const; | 295 bool HasFindBarController() const; |
| 296 | 296 |
| 297 // Returns the state of the bookmark bar. | 297 // Returns the state of the bookmark bar. |
| (...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 956 | 956 |
| 957 // Helper which implements the TabRestoreServiceDelegate interface. | 957 // Helper which implements the TabRestoreServiceDelegate interface. |
| 958 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 958 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
| 959 | 959 |
| 960 // Helper which implements the SyncedWindowDelegate interface. | 960 // Helper which implements the SyncedWindowDelegate interface. |
| 961 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; | 961 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; |
| 962 | 962 |
| 963 scoped_ptr<BrowserInstantController> instant_controller_; | 963 scoped_ptr<BrowserInstantController> instant_controller_; |
| 964 | 964 |
| 965 // Helper which handles bookmark app specific browser configuration. | 965 // Helper which handles bookmark app specific browser configuration. |
| 966 scoped_ptr<extensions::BookmarkAppBrowserController> bookmark_app_controller_; | 966 scoped_ptr<extensions::HostedAppBrowserController> hosted_app_controller_; |
| 967 | 967 |
| 968 BookmarkBar::State bookmark_bar_state_; | 968 BookmarkBar::State bookmark_bar_state_; |
| 969 | 969 |
| 970 scoped_ptr<ExclusiveAccessManager> exclusive_access_manager_; | 970 scoped_ptr<ExclusiveAccessManager> exclusive_access_manager_; |
| 971 | 971 |
| 972 scoped_ptr<extensions::WindowController> extension_window_controller_; | 972 scoped_ptr<extensions::WindowController> extension_window_controller_; |
| 973 | 973 |
| 974 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 974 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
| 975 | 975 |
| 976 // True if the browser window has been shown at least once. | 976 // True if the browser window has been shown at least once. |
| 977 bool window_has_shown_; | 977 bool window_has_shown_; |
| 978 | 978 |
| 979 scoped_ptr<ValidationMessageBubble> validation_message_bubble_; | 979 scoped_ptr<ValidationMessageBubble> validation_message_bubble_; |
| 980 | 980 |
| 981 // The following factory is used for chrome update coalescing. | 981 // The following factory is used for chrome update coalescing. |
| 982 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 982 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 983 | 983 |
| 984 // The following factory is used to close the frame at a later time. | 984 // The following factory is used to close the frame at a later time. |
| 985 base::WeakPtrFactory<Browser> weak_factory_; | 985 base::WeakPtrFactory<Browser> weak_factory_; |
| 986 | 986 |
| 987 DISALLOW_COPY_AND_ASSIGN(Browser); | 987 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 988 }; | 988 }; |
| 989 | 989 |
| 990 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 990 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |