OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 window(NULL) {} | 302 window(NULL) {} |
303 | 303 |
304 Browser::CreateParams::CreateParams(Type type, Profile* profile) | 304 Browser::CreateParams::CreateParams(Type type, Profile* profile) |
305 : type(type), | 305 : type(type), |
306 profile(profile), | 306 profile(profile), |
307 trusted_source(false), | 307 trusted_source(false), |
308 initial_show_state(ui::SHOW_STATE_DEFAULT), | 308 initial_show_state(ui::SHOW_STATE_DEFAULT), |
309 is_session_restore(false), | 309 is_session_restore(false), |
310 window(NULL) {} | 310 window(NULL) {} |
311 | 311 |
| 312 Browser::CreateParams::CreateParams(const CreateParams& other) = default; |
| 313 |
312 // static | 314 // static |
313 Browser::CreateParams Browser::CreateParams::CreateForApp( | 315 Browser::CreateParams Browser::CreateParams::CreateForApp( |
314 const std::string& app_name, | 316 const std::string& app_name, |
315 bool trusted_source, | 317 bool trusted_source, |
316 const gfx::Rect& window_bounds, | 318 const gfx::Rect& window_bounds, |
317 Profile* profile) { | 319 Profile* profile) { |
318 DCHECK(!app_name.empty()); | 320 DCHECK(!app_name.empty()); |
319 | 321 |
320 CreateParams params(TYPE_POPUP, profile); | 322 CreateParams params(TYPE_POPUP, profile); |
321 params.app_name = app_name; | 323 params.app_name = app_name; |
(...skipping 2410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2732 if (contents && !allow_js_access) { | 2734 if (contents && !allow_js_access) { |
2733 contents->web_contents()->GetController().LoadURL( | 2735 contents->web_contents()->GetController().LoadURL( |
2734 target_url, | 2736 target_url, |
2735 content::Referrer(), | 2737 content::Referrer(), |
2736 ui::PAGE_TRANSITION_LINK, | 2738 ui::PAGE_TRANSITION_LINK, |
2737 std::string()); // No extra headers. | 2739 std::string()); // No extra headers. |
2738 } | 2740 } |
2739 | 2741 |
2740 return contents != NULL; | 2742 return contents != NULL; |
2741 } | 2743 } |
OLD | NEW |