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

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

Issue 14969012: components: Create web_modal component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-before-land Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('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/string16.h" 20 #include "base/string16.h"
21 #include "chrome/browser/devtools/devtools_toggle_action.h" 21 #include "chrome/browser/devtools/devtools_toggle_action.h"
22 #include "chrome/browser/sessions/session_id.h" 22 #include "chrome/browser/sessions/session_id.h"
23 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 23 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
24 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 24 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
25 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 25 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
26 #include "chrome/browser/ui/browser_navigator.h" 26 #include "chrome/browser/ui/browser_navigator.h"
27 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
27 #include "chrome/browser/ui/host_desktop.h" 28 #include "chrome/browser/ui/host_desktop.h"
28 #include "chrome/browser/ui/search/search_model_observer.h" 29 #include "chrome/browser/ui/search/search_model_observer.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 "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
34 #include "chrome/browser/ui/zoom/zoom_observer.h" 34 #include "chrome/browser/ui/zoom/zoom_observer.h"
35 #include "chrome/common/content_settings.h" 35 #include "chrome/common/content_settings.h"
36 #include "chrome/common/content_settings_types.h" 36 #include "chrome/common/content_settings_types.h"
37 #include "chrome/common/extensions/extension_constants.h" 37 #include "chrome/common/extensions/extension_constants.h"
38 #include "content/public/browser/notification_observer.h" 38 #include "content/public/browser/notification_observer.h"
39 #include "content/public/browser/notification_registrar.h" 39 #include "content/public/browser/notification_registrar.h"
40 #include "content/public/browser/page_navigator.h" 40 #include "content/public/browser/page_navigator.h"
41 #include "content/public/browser/web_contents_delegate.h" 41 #include "content/public/browser/web_contents_delegate.h"
42 #include "content/public/common/page_transition_types.h" 42 #include "content/public/common/page_transition_types.h"
43 #include "content/public/common/page_zoom.h" 43 #include "content/public/common/page_zoom.h"
(...skipping 12 matching lines...) Expand all
56 class FullscreenController; 56 class FullscreenController;
57 class PrefService; 57 class PrefService;
58 class Profile; 58 class Profile;
59 class SearchDelegate; 59 class SearchDelegate;
60 class SearchModel; 60 class SearchModel;
61 class StatusBubble; 61 class StatusBubble;
62 class TabStripModel; 62 class TabStripModel;
63 class TabStripModelDelegate; 63 class TabStripModelDelegate;
64 struct SearchMode; 64 struct SearchMode;
65 struct WebApplicationInfo; 65 struct WebApplicationInfo;
66 class WebContentsModalDialogHost;
67 66
68 namespace chrome { 67 namespace chrome {
69 class BrowserCommandController; 68 class BrowserCommandController;
70 class UnloadController; 69 class UnloadController;
71 } 70 }
72 71
73 namespace content { 72 namespace content {
74 class NavigationController; 73 class NavigationController;
75 class SessionStorageNamespace; 74 class SessionStorageNamespace;
76 } 75 }
77 76
78 namespace extensions { 77 namespace extensions {
79 class Extension; 78 class Extension;
80 class WindowController; 79 class WindowController;
81 } 80 }
82 81
83 namespace gfx { 82 namespace gfx {
84 class Image; 83 class Image;
85 class Point; 84 class Point;
86 } 85 }
87 86
88 namespace ui { 87 namespace ui {
89 struct SelectedFileInfo; 88 struct SelectedFileInfo;
90 class WebDialogDelegate; 89 class WebDialogDelegate;
91 } 90 }
92 91
92 namespace web_modal {
93 class WebContentsModalDialogHost;
94 }
95
93 class Browser : public TabStripModelObserver, 96 class Browser : public TabStripModelObserver,
94 public content::WebContentsDelegate, 97 public content::WebContentsDelegate,
95 public CoreTabHelperDelegate, 98 public CoreTabHelperDelegate,
96 public SearchEngineTabHelperDelegate, 99 public SearchEngineTabHelperDelegate,
97 public WebContentsModalDialogManagerDelegate, 100 public ChromeWebModalDialogManagerDelegate,
98 public BlockedContentTabHelperDelegate, 101 public BlockedContentTabHelperDelegate,
99 public BookmarkTabHelperDelegate, 102 public BookmarkTabHelperDelegate,
100 public ZoomObserver, 103 public ZoomObserver,
101 public content::PageNavigator, 104 public content::PageNavigator,
102 public content::NotificationObserver, 105 public content::NotificationObserver,
103 public ui::SelectFileDialog::Listener, 106 public ui::SelectFileDialog::Listener,
104 public SearchModelObserver { 107 public SearchModelObserver {
105 public: 108 public:
106 // SessionService::WindowType mirrors these values. If you add to this 109 // SessionService::WindowType mirrors these values. If you add to this
107 // enum, look at SessionService::WindowType to see if it needs to be 110 // enum, look at SessionService::WindowType to see if it needs to be
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 virtual bool CanSaveContents( 633 virtual bool CanSaveContents(
631 content::WebContents* web_contents) const OVERRIDE; 634 content::WebContents* web_contents) const OVERRIDE;
632 635
633 // Overridden from SearchEngineTabHelperDelegate: 636 // Overridden from SearchEngineTabHelperDelegate:
634 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 637 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
635 Profile* profile) OVERRIDE; 638 Profile* profile) OVERRIDE;
636 639
637 // Overridden from WebContentsModalDialogManagerDelegate: 640 // Overridden from WebContentsModalDialogManagerDelegate:
638 virtual void SetWebContentsBlocked(content::WebContents* web_contents, 641 virtual void SetWebContentsBlocked(content::WebContents* web_contents,
639 bool blocked) OVERRIDE; 642 bool blocked) OVERRIDE;
640 virtual WebContentsModalDialogHost* 643 virtual web_modal::WebContentsModalDialogHost*
641 GetWebContentsModalDialogHost() OVERRIDE; 644 GetWebContentsModalDialogHost() OVERRIDE;
642 645
643 // Overridden from BlockedContentTabHelperDelegate: 646 // Overridden from BlockedContentTabHelperDelegate:
644 virtual content::WebContents* GetConstrainingWebContents( 647 virtual content::WebContents* GetConstrainingWebContents(
645 content::WebContents* source) OVERRIDE; 648 content::WebContents* source) OVERRIDE;
646 649
647 // Overridden from BookmarkTabHelperDelegate: 650 // Overridden from BookmarkTabHelperDelegate:
648 virtual void URLStarredChanged(content::WebContents* web_contents, 651 virtual void URLStarredChanged(content::WebContents* web_contents,
649 bool starred) OVERRIDE; 652 bool starred) OVERRIDE;
650 653
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 bool window_has_shown_; 915 bool window_has_shown_;
913 916
914 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 917 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
915 // before DidEndColorChooser is called. 918 // before DidEndColorChooser is called.
916 scoped_ptr<content::ColorChooser> color_chooser_; 919 scoped_ptr<content::ColorChooser> color_chooser_;
917 920
918 DISALLOW_COPY_AND_ASSIGN(Browser); 921 DISALLOW_COPY_AND_ASSIGN(Browser);
919 }; 922 };
920 923
921 #endif // CHROME_BROWSER_UI_BROWSER_H_ 924 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698