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

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

Issue 10820034: Remove redirection header and add "ui::" before all SelectFileDialog usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reuploading for different try run. Created 8 years, 4 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/file_select_helper.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>
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/intents/device_attached_intent_source.h" 21 #include "chrome/browser/intents/device_attached_intent_source.h"
22 #include "chrome/browser/prefs/pref_change_registrar.h" 22 #include "chrome/browser/prefs/pref_change_registrar.h"
23 #include "chrome/browser/prefs/pref_member.h" 23 #include "chrome/browser/prefs/pref_member.h"
24 #include "chrome/browser/sessions/session_id.h" 24 #include "chrome/browser/sessions/session_id.h"
25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
28 #include "chrome/browser/ui/browser_navigator.h" 28 #include "chrome/browser/ui/browser_navigator.h"
29 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" 29 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
30 #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"
31 #include "chrome/browser/ui/select_file_dialog.h"
32 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 31 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
33 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 32 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
34 #include "chrome/browser/ui/toolbar/toolbar_model.h" 33 #include "chrome/browser/ui/toolbar/toolbar_model.h"
35 #include "chrome/browser/ui/zoom/zoom_observer.h" 34 #include "chrome/browser/ui/zoom/zoom_observer.h"
36 #include "chrome/common/content_settings.h" 35 #include "chrome/common/content_settings.h"
37 #include "chrome/common/content_settings_types.h" 36 #include "chrome/common/content_settings_types.h"
38 #include "chrome/common/extensions/extension_constants.h" 37 #include "chrome/common/extensions/extension_constants.h"
39 #include "content/public/browser/notification_registrar.h" 38 #include "content/public/browser/notification_registrar.h"
40 #include "content/public/browser/page_navigator.h" 39 #include "content/public/browser/page_navigator.h"
41 #include "content/public/browser/web_contents_delegate.h" 40 #include "content/public/browser/web_contents_delegate.h"
42 #include "content/public/common/page_transition_types.h" 41 #include "content/public/common/page_transition_types.h"
43 #include "content/public/common/page_zoom.h" 42 #include "content/public/common/page_zoom.h"
43 #include "ui/base/dialogs/select_file_dialog.h"
44 #include "ui/base/ui_base_types.h" 44 #include "ui/base/ui_base_types.h"
45 #include "ui/gfx/rect.h" 45 #include "ui/gfx/rect.h"
46 46
47 class BrowserContentSettingBubbleModelDelegate; 47 class BrowserContentSettingBubbleModelDelegate;
48 class BrowserSyncedWindowDelegate; 48 class BrowserSyncedWindowDelegate;
49 class BrowserToolbarModelDelegate; 49 class BrowserToolbarModelDelegate;
50 class BrowserTabRestoreServiceDelegate; 50 class BrowserTabRestoreServiceDelegate;
51 class BrowserWindow; 51 class BrowserWindow;
52 class FindBarController; 52 class FindBarController;
53 class FullscreenController; 53 class FullscreenController;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 class Browser : public TabStripModelObserver, 96 class Browser : public TabStripModelObserver,
97 public content::WebContentsDelegate, 97 public content::WebContentsDelegate,
98 public CoreTabHelperDelegate, 98 public CoreTabHelperDelegate,
99 public SearchEngineTabHelperDelegate, 99 public SearchEngineTabHelperDelegate,
100 public ConstrainedWindowTabHelperDelegate, 100 public ConstrainedWindowTabHelperDelegate,
101 public BlockedContentTabHelperDelegate, 101 public BlockedContentTabHelperDelegate,
102 public BookmarkTabHelperDelegate, 102 public BookmarkTabHelperDelegate,
103 public ZoomObserver, 103 public ZoomObserver,
104 public content::PageNavigator, 104 public content::PageNavigator,
105 public content::NotificationObserver, 105 public content::NotificationObserver,
106 public SelectFileDialog::Listener { 106 public ui::SelectFileDialog::Listener {
107 public: 107 public:
108 // SessionService::WindowType mirrors these values. If you add to this 108 // SessionService::WindowType mirrors these values. If you add to this
109 // enum, look at SessionService::WindowType to see if it needs to be 109 // enum, look at SessionService::WindowType to see if it needs to be
110 // updated. 110 // updated.
111 enum Type { 111 enum Type {
112 // If you add a new type, consider updating the test 112 // If you add a new type, consider updating the test
113 // BrowserTest.StartMaximized. 113 // BrowserTest.StartMaximized.
114 TYPE_TABBED = 1, 114 TYPE_TABBED = 1,
115 TYPE_POPUP = 2, 115 TYPE_POPUP = 2,
116 TYPE_PANEL = 3 116 TYPE_PANEL = 3
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 scoped_ptr<chrome::UnloadController> unload_controller_; 864 scoped_ptr<chrome::UnloadController> unload_controller_;
865 865
866 // The following factory is used to close the frame at a later time. 866 // The following factory is used to close the frame at a later time.
867 base::WeakPtrFactory<Browser> weak_factory_; 867 base::WeakPtrFactory<Browser> weak_factory_;
868 868
869 // The Find Bar. This may be NULL if there is no Find Bar, and if it is 869 // The Find Bar. This may be NULL if there is no Find Bar, and if it is
870 // non-NULL, it may or may not be visible. 870 // non-NULL, it may or may not be visible.
871 scoped_ptr<FindBarController> find_bar_controller_; 871 scoped_ptr<FindBarController> find_bar_controller_;
872 872
873 // Dialog box used for opening and saving files. 873 // Dialog box used for opening and saving files.
874 scoped_refptr<SelectFileDialog> select_file_dialog_; 874 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
875 875
876 // Keep track of the encoding auto detect pref. 876 // Keep track of the encoding auto detect pref.
877 BooleanPrefMember encoding_auto_detect_; 877 BooleanPrefMember encoding_auto_detect_;
878 878
879 // Helper which implements the ContentSettingBubbleModel interface. 879 // Helper which implements the ContentSettingBubbleModel interface.
880 scoped_ptr<BrowserContentSettingBubbleModelDelegate> 880 scoped_ptr<BrowserContentSettingBubbleModelDelegate>
881 content_setting_bubble_model_delegate_; 881 content_setting_bubble_model_delegate_;
882 882
883 // Helper which implements the ToolbarModelDelegate interface. 883 // Helper which implements the ToolbarModelDelegate interface.
884 scoped_ptr<BrowserToolbarModelDelegate> toolbar_model_delegate_; 884 scoped_ptr<BrowserToolbarModelDelegate> toolbar_model_delegate_;
(...skipping 23 matching lines...) Expand all
908 bool window_has_shown_; 908 bool window_has_shown_;
909 909
910 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 910 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
911 // before DidEndColorChooser is called. 911 // before DidEndColorChooser is called.
912 scoped_ptr<content::ColorChooser> color_chooser_; 912 scoped_ptr<content::ColorChooser> color_chooser_;
913 913
914 DISALLOW_COPY_AND_ASSIGN(Browser); 914 DISALLOW_COPY_AND_ASSIGN(Browser);
915 }; 915 };
916 916
917 #endif // CHROME_BROWSER_UI_BROWSER_H_ 917 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/file_select_helper.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698