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

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: Work in Progress Created 5 years, 5 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
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>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #if defined(ENABLE_EXTENSIONS) 50 #if defined(ENABLE_EXTENSIONS)
51 #include "extensions/browser/extension_registry_observer.h" 51 #include "extensions/browser/extension_registry_observer.h"
52 #endif 52 #endif
53 53
54 class BrowserContentSettingBubbleModelDelegate; 54 class BrowserContentSettingBubbleModelDelegate;
55 class BrowserInstantController; 55 class BrowserInstantController;
56 class BrowserSyncedWindowDelegate; 56 class BrowserSyncedWindowDelegate;
57 class BrowserToolbarModelDelegate; 57 class BrowserToolbarModelDelegate;
58 class BrowserTabRestoreServiceDelegate; 58 class BrowserTabRestoreServiceDelegate;
59 class BrowserWindow; 59 class BrowserWindow;
60 class BubbleManager;
60 class FindBarController; 61 class FindBarController;
61 class PrefService; 62 class PrefService;
62 class Profile; 63 class Profile;
63 class SearchDelegate; 64 class SearchDelegate;
64 class SearchModel; 65 class SearchModel;
65 class StatusBubble; 66 class StatusBubble;
66 class TabStripModel; 67 class TabStripModel;
67 class TabStripModelDelegate; 68 class TabStripModelDelegate;
68 class ValidationMessageBubble; 69 class ValidationMessageBubble;
69 struct WebApplicationInfo; 70 struct WebApplicationInfo;
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 ToolbarModel* toolbar_model() { return toolbar_model_.get(); } 252 ToolbarModel* toolbar_model() { return toolbar_model_.get(); }
252 const ToolbarModel* toolbar_model() const { return toolbar_model_.get(); } 253 const ToolbarModel* toolbar_model() const { return toolbar_model_.get(); }
253 #if defined(UNIT_TEST) 254 #if defined(UNIT_TEST)
254 void swap_toolbar_models(scoped_ptr<ToolbarModel>* toolbar_model) { 255 void swap_toolbar_models(scoped_ptr<ToolbarModel>* toolbar_model) {
255 toolbar_model->swap(toolbar_model_); 256 toolbar_model->swap(toolbar_model_);
256 } 257 }
257 #endif 258 #endif
258 web_modal::PopupManager* popup_manager() { 259 web_modal::PopupManager* popup_manager() {
259 return popup_manager_.get(); 260 return popup_manager_.get();
260 } 261 }
262 BubbleManager* bubble_manager() { return bubble_manager_.get(); }
261 TabStripModel* tab_strip_model() const { return tab_strip_model_.get(); } 263 TabStripModel* tab_strip_model() const { return tab_strip_model_.get(); }
262 chrome::BrowserCommandController* command_controller() { 264 chrome::BrowserCommandController* command_controller() {
263 return command_controller_.get(); 265 return command_controller_.get();
264 } 266 }
265 SearchModel* search_model() { return search_model_.get(); } 267 SearchModel* search_model() { return search_model_.get(); }
266 const SearchModel* search_model() const { 268 const SearchModel* search_model() const {
267 return search_model_.get(); 269 return search_model_.get();
268 } 270 }
269 SearchDelegate* search_delegate() { 271 SearchDelegate* search_delegate() {
270 return search_delegate_.get(); 272 return search_delegate_.get();
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 // This Browser's profile. 857 // This Browser's profile.
856 Profile* const profile_; 858 Profile* const profile_;
857 859
858 // This Browser's window. 860 // This Browser's window.
859 BrowserWindow* window_; 861 BrowserWindow* window_;
860 862
861 // Manages popup windows (bubbles, tab-modals) visible overlapping this 863 // Manages popup windows (bubbles, tab-modals) visible overlapping this
862 // window. JS alerts are not handled by this manager. 864 // window. JS alerts are not handled by this manager.
863 scoped_ptr<web_modal::PopupManager> popup_manager_; 865 scoped_ptr<web_modal::PopupManager> popup_manager_;
864 866
867 scoped_ptr<BubbleManager> bubble_manager_;
868
865 scoped_ptr<TabStripModelDelegate> tab_strip_model_delegate_; 869 scoped_ptr<TabStripModelDelegate> tab_strip_model_delegate_;
866 scoped_ptr<TabStripModel> tab_strip_model_; 870 scoped_ptr<TabStripModel> tab_strip_model_;
867 871
868 // The application name that is also the name of the window to the shell. 872 // The application name that is also the name of the window to the shell.
869 // This name should be set when: 873 // This name should be set when:
870 // 1) we launch an application via an application shortcut or extension API. 874 // 1) we launch an application via an application shortcut or extension API.
871 // 2) we launch an undocked devtool window. 875 // 2) we launch an undocked devtool window.
872 std::string app_name_; 876 std::string app_name_;
873 877
874 // True if the source is trusted (i.e. we do not need to show the URL in a 878 // True if the source is trusted (i.e. we do not need to show the URL in a
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 // The following factory is used for chrome update coalescing. 985 // The following factory is used for chrome update coalescing.
982 base::WeakPtrFactory<Browser> chrome_updater_factory_; 986 base::WeakPtrFactory<Browser> chrome_updater_factory_;
983 987
984 // The following factory is used to close the frame at a later time. 988 // The following factory is used to close the frame at a later time.
985 base::WeakPtrFactory<Browser> weak_factory_; 989 base::WeakPtrFactory<Browser> weak_factory_;
986 990
987 DISALLOW_COPY_AND_ASSIGN(Browser); 991 DISALLOW_COPY_AND_ASSIGN(Browser);
988 }; 992 };
989 993
990 #endif // CHROME_BROWSER_UI_BROWSER_H_ 994 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698