| 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 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 if (!process_startup && !handled_by_chrome) | 693 if (!process_startup && !handled_by_chrome) |
| 694 continue; | 694 continue; |
| 695 | 695 |
| 696 int add_types = first_tab ? TabStripModel::ADD_ACTIVE : | 696 int add_types = first_tab ? TabStripModel::ADD_ACTIVE : |
| 697 TabStripModel::ADD_NONE; | 697 TabStripModel::ADD_NONE; |
| 698 add_types |= TabStripModel::ADD_FORCE_INDEX; | 698 add_types |= TabStripModel::ADD_FORCE_INDEX; |
| 699 if (tabs[i].is_pinned) | 699 if (tabs[i].is_pinned) |
| 700 add_types |= TabStripModel::ADD_PINNED; | 700 add_types |= TabStripModel::ADD_PINNED; |
| 701 int index = chrome::GetIndexForInsertionDuringRestore(browser, i); | 701 int index = chrome::GetIndexForInsertionDuringRestore(browser, i); |
| 702 | 702 |
| 703 browser::NavigateParams params(browser, tabs[i].url, | 703 chrome::NavigateParams params(browser, tabs[i].url, |
| 704 content::PAGE_TRANSITION_START_PAGE); | 704 content::PAGE_TRANSITION_START_PAGE); |
| 705 params.disposition = first_tab ? NEW_FOREGROUND_TAB : | 705 params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; |
| 706 NEW_BACKGROUND_TAB; | |
| 707 params.tabstrip_index = index; | 706 params.tabstrip_index = index; |
| 708 params.tabstrip_add_types = add_types; | 707 params.tabstrip_add_types = add_types; |
| 709 params.extension_app_id = tabs[i].app_id; | 708 params.extension_app_id = tabs[i].app_id; |
| 710 browser::Navigate(¶ms); | 709 chrome::Navigate(¶ms); |
| 711 | 710 |
| 712 first_tab = false; | 711 first_tab = false; |
| 713 } | 712 } |
| 714 if (!chrome::GetActiveWebContents(browser)) { | 713 if (!chrome::GetActiveWebContents(browser)) { |
| 715 // TODO: this is a work around for 110909. Figure out why it's needed. | 714 // TODO: this is a work around for 110909. Figure out why it's needed. |
| 716 if (!browser->tab_count()) | 715 if (!browser->tab_count()) |
| 717 browser->AddBlankTab(true); | 716 browser->AddBlankTab(true); |
| 718 else | 717 else |
| 719 chrome::ActivateTabAt(browser, 0, false); | 718 chrome::ActivateTabAt(browser, 0, false); |
| 720 } | 719 } |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 // New: | 860 // New: |
| 862 prefs->GetString(prefs::kHomePage), | 861 prefs->GetString(prefs::kHomePage), |
| 863 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), | 862 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), |
| 864 prefs->GetBoolean(prefs::kShowHomeButton), | 863 prefs->GetBoolean(prefs::kShowHomeButton), |
| 865 // Backup: | 864 // Backup: |
| 866 backup_homepage, | 865 backup_homepage, |
| 867 backup_homepage_is_ntp, | 866 backup_homepage_is_ntp, |
| 868 backup_show_home_button)); | 867 backup_show_home_button)); |
| 869 } | 868 } |
| 870 } | 869 } |
| OLD | NEW |