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

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

Issue 1779793003: Remove host_desktop_type() from browser.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-43
Patch Set: cros Created 4 years, 9 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 } 224 }
225 // Set indicator that this browser is being created via session restore. 225 // Set indicator that this browser is being created via session restore.
226 // This is used on the Mac (only) to determine animation style when the 226 // This is used on the Mac (only) to determine animation style when the
227 // browser window is shown. 227 // browser window is shown.
228 void set_is_session_restore(bool is_session_restore) { 228 void set_is_session_restore(bool is_session_restore) {
229 is_session_restore_ = is_session_restore; 229 is_session_restore_ = is_session_restore;
230 } 230 }
231 bool is_session_restore() const { 231 bool is_session_restore() const {
232 return is_session_restore_; 232 return is_session_restore_;
233 } 233 }
234 chrome::HostDesktopType host_desktop_type() const {
235 return host_desktop_type_;
236 }
237 234
238 // Accessors //////////////////////////////////////////////////////////////// 235 // Accessors ////////////////////////////////////////////////////////////////
239 236
240 Type type() const { return type_; } 237 Type type() const { return type_; }
241 const std::string& app_name() const { return app_name_; } 238 const std::string& app_name() const { return app_name_; }
242 bool is_trusted_source() const { return is_trusted_source_; } 239 bool is_trusted_source() const { return is_trusted_source_; }
243 Profile* profile() const { return profile_; } 240 Profile* profile() const { return profile_; }
244 gfx::Rect override_bounds() const { return override_bounds_; } 241 gfx::Rect override_bounds() const { return override_bounds_; }
245 242
246 // |window()| will return NULL if called before |CreateBrowserWindow()| 243 // |window()| will return NULL if called before |CreateBrowserWindow()|
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 // These are supplied by callers that don't want to use the default values. 934 // These are supplied by callers that don't want to use the default values.
938 // The default values are typically loaded from local state (last session), 935 // The default values are typically loaded from local state (last session),
939 // obtained from the last window of the same type, or obtained from the 936 // obtained from the last window of the same type, or obtained from the
940 // shell shortcut's startup info. 937 // shell shortcut's startup info.
941 gfx::Rect override_bounds_; 938 gfx::Rect override_bounds_;
942 ui::WindowShowState initial_show_state_; 939 ui::WindowShowState initial_show_state_;
943 940
944 // Tracks when this browser is being created by session restore. 941 // Tracks when this browser is being created by session restore.
945 bool is_session_restore_; 942 bool is_session_restore_;
946 943
947 const chrome::HostDesktopType host_desktop_type_;
948
949 scoped_ptr<chrome::UnloadController> unload_controller_; 944 scoped_ptr<chrome::UnloadController> unload_controller_;
950 scoped_ptr<chrome::FastUnloadController> fast_unload_controller_; 945 scoped_ptr<chrome::FastUnloadController> fast_unload_controller_;
951 946
952 scoped_ptr<ChromeBubbleManager> bubble_manager_; 947 scoped_ptr<ChromeBubbleManager> bubble_manager_;
953 948
954 // The Find Bar. This may be NULL if there is no Find Bar, and if it is 949 // The Find Bar. This may be NULL if there is no Find Bar, and if it is
955 // non-NULL, it may or may not be visible. 950 // non-NULL, it may or may not be visible.
956 scoped_ptr<FindBarController> find_bar_controller_; 951 scoped_ptr<FindBarController> find_bar_controller_;
957 952
958 // Dialog box used for opening and saving files. 953 // Dialog box used for opening and saving files.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 // The following factory is used for chrome update coalescing. 996 // The following factory is used for chrome update coalescing.
1002 base::WeakPtrFactory<Browser> chrome_updater_factory_; 997 base::WeakPtrFactory<Browser> chrome_updater_factory_;
1003 998
1004 // The following factory is used to close the frame at a later time. 999 // The following factory is used to close the frame at a later time.
1005 base::WeakPtrFactory<Browser> weak_factory_; 1000 base::WeakPtrFactory<Browser> weak_factory_;
1006 1001
1007 DISALLOW_COPY_AND_ASSIGN(Browser); 1002 DISALLOW_COPY_AND_ASSIGN(Browser);
1008 }; 1003 };
1009 1004
1010 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1005 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698