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 <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "apps/app_restore_service.h" | 10 #include "apps/app_restore_service.h" |
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
800 | 800 |
801 chrome::NavigateParams params(browser, tabs[i].url, | 801 chrome::NavigateParams params(browser, tabs[i].url, |
802 content::PAGE_TRANSITION_AUTO_TOPLEVEL); | 802 content::PAGE_TRANSITION_AUTO_TOPLEVEL); |
803 params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; | 803 params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; |
804 params.tabstrip_add_types = add_types; | 804 params.tabstrip_add_types = add_types; |
805 params.extension_app_id = tabs[i].app_id; | 805 params.extension_app_id = tabs[i].app_id; |
806 | 806 |
807 #if defined(ENABLE_RLZ) && !defined(OS_IOS) | 807 #if defined(ENABLE_RLZ) && !defined(OS_IOS) |
808 if (process_startup && google_util::IsGoogleHomePageUrl(tabs[i].url)) { | 808 if (process_startup && google_util::IsGoogleHomePageUrl(tabs[i].url)) { |
809 params.extra_headers = RLZTracker::GetAccessPointHttpHeader( | 809 params.extra_headers = RLZTracker::GetAccessPointHttpHeader( |
810 RLZTracker::CHROME_HOME_PAGE); | 810 RLZTracker::ChromeHomePage()); |
811 } | 811 } |
812 #endif // defined(ENABLE_RLZ) && !defined(OS_IOS) | 812 #endif // defined(ENABLE_RLZ) && !defined(OS_IOS) |
813 | 813 |
814 chrome::Navigate(¶ms); | 814 chrome::Navigate(¶ms); |
815 | 815 |
816 first_tab = false; | 816 first_tab = false; |
817 } | 817 } |
818 if (!browser->tab_strip_model()->GetActiveWebContents()) { | 818 if (!browser->tab_strip_model()->GetActiveWebContents()) { |
819 // TODO: this is a work around for 110909. Figure out why it's needed. | 819 // TODO: this is a work around for 110909. Figure out why it's needed. |
820 if (!browser->tab_strip_model()->count()) | 820 if (!browser->tab_strip_model()->count()) |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
933 // If the first URL is the NTP, replace it with the sync promo. This | 933 // If the first URL is the NTP, replace it with the sync promo. This |
934 // behavior is desired because completing or skipping the sync promo | 934 // behavior is desired because completing or skipping the sync promo |
935 // causes a redirect to the NTP. | 935 // causes a redirect to the NTP. |
936 if (!startup_urls->empty() && IsNewTabURL(profile_, startup_urls->at(0))) | 936 if (!startup_urls->empty() && IsNewTabURL(profile_, startup_urls->at(0))) |
937 startup_urls->at(0) = sync_promo_url; | 937 startup_urls->at(0) = sync_promo_url; |
938 else | 938 else |
939 startup_urls->insert(startup_urls->begin(), sync_promo_url); | 939 startup_urls->insert(startup_urls->begin(), sync_promo_url); |
940 } | 940 } |
941 } | 941 } |
942 } | 942 } |
OLD | NEW |