| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 class BrowserTabRestoreServiceDelegate; | 58 class BrowserTabRestoreServiceDelegate; |
| 59 class BrowserWindow; | 59 class BrowserWindow; |
| 60 class FindBarController; | 60 class FindBarController; |
| 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 class PermissionBubbleView; |
| 68 class ValidationMessageBubble; | 69 class ValidationMessageBubble; |
| 69 struct WebApplicationInfo; | 70 struct WebApplicationInfo; |
| 70 | 71 |
| 71 namespace chrome { | 72 namespace chrome { |
| 72 class BrowserCommandController; | 73 class BrowserCommandController; |
| 73 class FastUnloadController; | 74 class FastUnloadController; |
| 74 class UnloadController; | 75 class UnloadController; |
| 75 } | 76 } |
| 76 | 77 |
| 77 namespace content { | 78 namespace content { |
| (...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 815 // |check_fullscreen| is true, the set of features reflect the actual state of | 816 // |check_fullscreen| is true, the set of features reflect the actual state of |
| 816 // the browser, otherwise the set of features reflect the possible state of | 817 // the browser, otherwise the set of features reflect the possible state of |
| 817 // the browser. | 818 // the browser. |
| 818 bool SupportsWindowFeatureImpl(WindowFeature feature, | 819 bool SupportsWindowFeatureImpl(WindowFeature feature, |
| 819 bool check_fullscreen) const; | 820 bool check_fullscreen) const; |
| 820 | 821 |
| 821 // Resets |bookmark_bar_state_| based on the active tab. Notifies the | 822 // Resets |bookmark_bar_state_| based on the active tab. Notifies the |
| 822 // BrowserWindow if necessary. | 823 // BrowserWindow if necessary. |
| 823 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); | 824 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); |
| 824 | 825 |
| 826 // Transfers the permission bubble view between tabs, updating it |
| 827 // according to the new tab's state. |
| 828 void TransferPermissionBubble(content::WebContents* old_contents, |
| 829 content::WebContents* new_contents); |
| 830 |
| 825 bool ShouldHideUIForFullscreen() const; | 831 bool ShouldHideUIForFullscreen() const; |
| 826 | 832 |
| 827 // Creates a BackgroundContents if appropriate; return true if one was | 833 // Creates a BackgroundContents if appropriate; return true if one was |
| 828 // created. | 834 // created. |
| 829 bool MaybeCreateBackgroundContents( | 835 bool MaybeCreateBackgroundContents( |
| 830 int route_id, | 836 int route_id, |
| 831 int main_frame_route_id, | 837 int main_frame_route_id, |
| 832 content::WebContents* opener_web_contents, | 838 content::WebContents* opener_web_contents, |
| 833 const base::string16& frame_name, | 839 const base::string16& frame_name, |
| 834 const GURL& target_url, | 840 const GURL& target_url, |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 971 | 977 |
| 972 scoped_ptr<extensions::WindowController> extension_window_controller_; | 978 scoped_ptr<extensions::WindowController> extension_window_controller_; |
| 973 | 979 |
| 974 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 980 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
| 975 | 981 |
| 976 // True if the browser window has been shown at least once. | 982 // True if the browser window has been shown at least once. |
| 977 bool window_has_shown_; | 983 bool window_has_shown_; |
| 978 | 984 |
| 979 scoped_ptr<ValidationMessageBubble> validation_message_bubble_; | 985 scoped_ptr<ValidationMessageBubble> validation_message_bubble_; |
| 980 | 986 |
| 987 scoped_ptr<PermissionBubbleView> permission_bubble_; |
| 988 |
| 981 // The following factory is used for chrome update coalescing. | 989 // The following factory is used for chrome update coalescing. |
| 982 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 990 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 983 | 991 |
| 984 // The following factory is used to close the frame at a later time. | 992 // The following factory is used to close the frame at a later time. |
| 985 base::WeakPtrFactory<Browser> weak_factory_; | 993 base::WeakPtrFactory<Browser> weak_factory_; |
| 986 | 994 |
| 987 DISALLOW_COPY_AND_ASSIGN(Browser); | 995 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 988 }; | 996 }; |
| 989 | 997 |
| 990 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 998 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |