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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)), | 365 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)), |
366 tab_strip_model_( | 366 tab_strip_model_( |
367 new TabStripModel(tab_strip_model_delegate_.get(), params.profile)), | 367 new TabStripModel(tab_strip_model_delegate_.get(), params.profile)), |
368 app_name_(params.app_name), | 368 app_name_(params.app_name), |
369 is_trusted_source_(params.trusted_source), | 369 is_trusted_source_(params.trusted_source), |
370 cancel_download_confirmation_state_(NOT_PROMPTED), | 370 cancel_download_confirmation_state_(NOT_PROMPTED), |
371 override_bounds_(params.initial_bounds), | 371 override_bounds_(params.initial_bounds), |
372 initial_show_state_(params.initial_show_state), | 372 initial_show_state_(params.initial_show_state), |
373 initial_workspace_(params.initial_workspace), | 373 initial_workspace_(params.initial_workspace), |
374 is_session_restore_(params.is_session_restore), | 374 is_session_restore_(params.is_session_restore), |
| 375 is_used_for_session_restore_(params.is_session_restore), |
375 content_setting_bubble_model_delegate_( | 376 content_setting_bubble_model_delegate_( |
376 new BrowserContentSettingBubbleModelDelegate(this)), | 377 new BrowserContentSettingBubbleModelDelegate(this)), |
377 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)), | 378 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)), |
378 live_tab_context_(new BrowserLiveTabContext(this)), | 379 live_tab_context_(new BrowserLiveTabContext(this)), |
379 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)), | 380 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)), |
380 bookmark_bar_state_(BookmarkBar::HIDDEN), | 381 bookmark_bar_state_(BookmarkBar::HIDDEN), |
381 command_controller_(new chrome::BrowserCommandController(this)), | 382 command_controller_(new chrome::BrowserCommandController(this)), |
382 window_has_shown_(false), | 383 window_has_shown_(false), |
383 chrome_updater_factory_(this), | 384 chrome_updater_factory_(this), |
384 weak_factory_(this) { | 385 weak_factory_(this) { |
(...skipping 2237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2622 // new window later, thus we need to navigate the window now. | 2623 // new window later, thus we need to navigate the window now. |
2623 if (contents) { | 2624 if (contents) { |
2624 contents->web_contents()->GetController().LoadURL( | 2625 contents->web_contents()->GetController().LoadURL( |
2625 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, | 2626 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, |
2626 std::string()); // No extra headers. | 2627 std::string()); // No extra headers. |
2627 } | 2628 } |
2628 } | 2629 } |
2629 | 2630 |
2630 return contents != NULL; | 2631 return contents != NULL; |
2631 } | 2632 } |
OLD | NEW |