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

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

Issue 1662783002: Remove HostDesktopType from Browser::CreateParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-12
Patch Set: remove desktop_type_ in bookmark_bubble_sign_in_delegate Created 4 years, 10 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // The browser is shutting down and there are active downloads 155 // The browser is shutting down and there are active downloads
156 // that would be cancelled. 156 // that would be cancelled.
157 DOWNLOAD_CLOSE_BROWSER_SHUTDOWN, 157 DOWNLOAD_CLOSE_BROWSER_SHUTDOWN,
158 158
159 // There are active downloads associated with this incognito profile 159 // There are active downloads associated with this incognito profile
160 // that would be canceled. 160 // that would be canceled.
161 DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE, 161 DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE,
162 }; 162 };
163 163
164 struct CreateParams { 164 struct CreateParams {
165 CreateParams(Profile* profile, chrome::HostDesktopType host_desktop_type); 165 explicit CreateParams(Profile* profile);
166 CreateParams(Type type, 166 CreateParams(Type type, Profile* profile);
167 Profile* profile,
168 chrome::HostDesktopType host_desktop_type);
169 167
170 static CreateParams CreateForApp(const std::string& app_name, 168 static CreateParams CreateForApp(const std::string& app_name,
171 bool trusted_source, 169 bool trusted_source,
172 const gfx::Rect& window_bounds, 170 const gfx::Rect& window_bounds,
173 Profile* profile, 171 Profile* profile);
174 chrome::HostDesktopType host_desktop_type);
175 172
176 static CreateParams CreateForDevTools( 173 static CreateParams CreateForDevTools(Profile* profile);
177 Profile* profile,
178 chrome::HostDesktopType host_desktop_type);
179 174
180 // The browser type. 175 // The browser type.
181 Type type; 176 Type type;
182 177
183 // The associated profile. 178 // The associated profile.
184 Profile* profile; 179 Profile* profile;
185 180
186 // The host desktop the browser is created on.
187 chrome::HostDesktopType host_desktop_type;
188
189 // Specifies the browser is_trusted_source_ value. 181 // Specifies the browser is_trusted_source_ value.
190 bool trusted_source; 182 bool trusted_source;
191 183
192 // The bounds of the window to open. 184 // The bounds of the window to open.
193 gfx::Rect initial_bounds; 185 gfx::Rect initial_bounds;
194 186
195 ui::WindowShowState initial_show_state; 187 ui::WindowShowState initial_show_state;
196 188
197 bool is_session_restore; 189 bool is_session_restore;
198 190
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 // The following factory is used for chrome update coalescing. 1006 // The following factory is used for chrome update coalescing.
1015 base::WeakPtrFactory<Browser> chrome_updater_factory_; 1007 base::WeakPtrFactory<Browser> chrome_updater_factory_;
1016 1008
1017 // The following factory is used to close the frame at a later time. 1009 // The following factory is used to close the frame at a later time.
1018 base::WeakPtrFactory<Browser> weak_factory_; 1010 base::WeakPtrFactory<Browser> weak_factory_;
1019 1011
1020 DISALLOW_COPY_AND_ASSIGN(Browser); 1012 DISALLOW_COPY_AND_ASSIGN(Browser);
1021 }; 1013 };
1022 1014
1023 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1015 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698