Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(643)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 1251633002: Add BubbleManager to manage bubbles and ChromeBubbleManager for events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn nit Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/DEPS ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_bubble_manager.h"
26 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" 27 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
27 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" 28 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
28 #include "chrome/browser/ui/host_desktop.h" 29 #include "chrome/browser/ui/host_desktop.h"
29 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" 30 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
30 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 31 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
31 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 32 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
32 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model_observer.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"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 BrowserSyncedWindowDelegate* synced_window_delegate() { 277 BrowserSyncedWindowDelegate* synced_window_delegate() {
277 return synced_window_delegate_.get(); 278 return synced_window_delegate_.get();
278 } 279 }
279 BrowserInstantController* instant_controller() { 280 BrowserInstantController* instant_controller() {
280 return instant_controller_.get(); 281 return instant_controller_.get();
281 } 282 }
282 extensions::HostedAppBrowserController* hosted_app_controller() { 283 extensions::HostedAppBrowserController* hosted_app_controller() {
283 return hosted_app_controller_.get(); 284 return hosted_app_controller_.get();
284 } 285 }
285 286
287 // Will lazy create the bubble manager.
288 ChromeBubbleManager* GetBubbleManager();
289
286 // 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
287 // yet exist. 291 // yet exist.
288 FindBarController* GetFindBarController(); 292 FindBarController* GetFindBarController();
289 293
290 // Returns true if a FindBarController exists for this browser. 294 // Returns true if a FindBarController exists for this browser.
291 bool HasFindBarController() const; 295 bool HasFindBarController() const;
292 296
293 // Returns the state of the bookmark bar. 297 // Returns the state of the bookmark bar.
294 BookmarkBar::State bookmark_bar_state() const { return bookmark_bar_state_; } 298 BookmarkBar::State bookmark_bar_state() const { return bookmark_bar_state_; }
295 299
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 ui::WindowShowState initial_show_state_; 921 ui::WindowShowState initial_show_state_;
918 922
919 // Tracks when this browser is being created by session restore. 923 // Tracks when this browser is being created by session restore.
920 bool is_session_restore_; 924 bool is_session_restore_;
921 925
922 const chrome::HostDesktopType host_desktop_type_; 926 const chrome::HostDesktopType host_desktop_type_;
923 927
924 scoped_ptr<chrome::UnloadController> unload_controller_; 928 scoped_ptr<chrome::UnloadController> unload_controller_;
925 scoped_ptr<chrome::FastUnloadController> fast_unload_controller_; 929 scoped_ptr<chrome::FastUnloadController> fast_unload_controller_;
926 930
931 scoped_ptr<ChromeBubbleManager> bubble_manager_;
932
927 // The Find Bar. This may be NULL if there is no Find Bar, and if it is 933 // The Find Bar. This may be NULL if there is no Find Bar, and if it is
928 // non-NULL, it may or may not be visible. 934 // non-NULL, it may or may not be visible.
929 scoped_ptr<FindBarController> find_bar_controller_; 935 scoped_ptr<FindBarController> find_bar_controller_;
930 936
931 // Dialog box used for opening and saving files. 937 // Dialog box used for opening and saving files.
932 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 938 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
933 939
934 // Keep track of the encoding auto detect pref. 940 // Keep track of the encoding auto detect pref.
935 BooleanPrefMember encoding_auto_detect_; 941 BooleanPrefMember encoding_auto_detect_;
936 942
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 // The following factory is used for chrome update coalescing. 978 // The following factory is used for chrome update coalescing.
973 base::WeakPtrFactory<Browser> chrome_updater_factory_; 979 base::WeakPtrFactory<Browser> chrome_updater_factory_;
974 980
975 // The following factory is used to close the frame at a later time. 981 // The following factory is used to close the frame at a later time.
976 base::WeakPtrFactory<Browser> weak_factory_; 982 base::WeakPtrFactory<Browser> weak_factory_;
977 983
978 DISALLOW_COPY_AND_ASSIGN(Browser); 984 DISALLOW_COPY_AND_ASSIGN(Browser);
979 }; 985 };
980 986
981 #endif // CHROME_BROWSER_UI_BROWSER_H_ 987 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/DEPS ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698