OLD | NEW |
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 // The browser is shutting down and there are active downloads | 153 // The browser is shutting down and there are active downloads |
154 // that would be cancelled. | 154 // that would be cancelled. |
155 DOWNLOAD_CLOSE_BROWSER_SHUTDOWN, | 155 DOWNLOAD_CLOSE_BROWSER_SHUTDOWN, |
156 | 156 |
157 // There are active downloads associated with this incognito profile | 157 // There are active downloads associated with this incognito profile |
158 // that would be canceled. | 158 // that would be canceled. |
159 DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE, | 159 DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE, |
160 }; | 160 }; |
161 | 161 |
162 struct CreateParams { | 162 struct CreateParams { |
163 CreateParams(Profile* profile, chrome::HostDesktopType host_desktop_type); | 163 explicit CreateParams(Profile* profile); |
164 CreateParams(Type type, | 164 CreateParams(Type type, Profile* profile); |
165 Profile* profile, | |
166 chrome::HostDesktopType host_desktop_type); | |
167 | 165 |
168 static CreateParams CreateForApp(const std::string& app_name, | 166 static CreateParams CreateForApp(const std::string& app_name, |
169 bool trusted_source, | 167 bool trusted_source, |
170 const gfx::Rect& window_bounds, | 168 const gfx::Rect& window_bounds, |
171 Profile* profile, | 169 Profile* profile); |
172 chrome::HostDesktopType host_desktop_type); | |
173 | 170 |
174 static CreateParams CreateForDevTools( | 171 static CreateParams CreateForDevTools(Profile* profile); |
175 Profile* profile, | |
176 chrome::HostDesktopType host_desktop_type); | |
177 | 172 |
178 // The browser type. | 173 // The browser type. |
179 Type type; | 174 Type type; |
180 | 175 |
181 // The associated profile. | 176 // The associated profile. |
182 Profile* profile; | 177 Profile* profile; |
183 | 178 |
184 // The host desktop the browser is created on. | |
185 chrome::HostDesktopType host_desktop_type; | |
186 | |
187 // Specifies the browser is_trusted_source_ value. | 179 // Specifies the browser is_trusted_source_ value. |
188 bool trusted_source; | 180 bool trusted_source; |
189 | 181 |
190 // The bounds of the window to open. | 182 // The bounds of the window to open. |
191 gfx::Rect initial_bounds; | 183 gfx::Rect initial_bounds; |
192 | 184 |
193 ui::WindowShowState initial_show_state; | 185 ui::WindowShowState initial_show_state; |
194 | 186 |
195 bool is_session_restore; | 187 bool is_session_restore; |
196 | 188 |
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
995 // The following factory is used for chrome update coalescing. | 987 // The following factory is used for chrome update coalescing. |
996 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 988 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
997 | 989 |
998 // The following factory is used to close the frame at a later time. | 990 // The following factory is used to close the frame at a later time. |
999 base::WeakPtrFactory<Browser> weak_factory_; | 991 base::WeakPtrFactory<Browser> weak_factory_; |
1000 | 992 |
1001 DISALLOW_COPY_AND_ASSIGN(Browser); | 993 DISALLOW_COPY_AND_ASSIGN(Browser); |
1002 }; | 994 }; |
1003 | 995 |
1004 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 996 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |