| 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 add_types |= TabStripModel::ADD_PINNED; | 824 add_types |= TabStripModel::ADD_PINNED; |
| 825 | 825 |
| 826 chrome::NavigateParams params(browser, tabs[i].url, | 826 chrome::NavigateParams params(browser, tabs[i].url, |
| 827 content::PAGE_TRANSITION_AUTO_TOPLEVEL); | 827 content::PAGE_TRANSITION_AUTO_TOPLEVEL); |
| 828 params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; | 828 params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; |
| 829 params.tabstrip_add_types = add_types; | 829 params.tabstrip_add_types = add_types; |
| 830 params.extension_app_id = tabs[i].app_id; | 830 params.extension_app_id = tabs[i].app_id; |
| 831 | 831 |
| 832 #if defined(ENABLE_RLZ) | 832 #if defined(ENABLE_RLZ) |
| 833 if (process_startup && | 833 if (process_startup && |
| 834 google_util::IsGoogleHomePageUrl(tabs[i].url.spec())) { | 834 google_util::IsGoogleHomePageUrl(tabs[i].url)) { |
| 835 params.extra_headers = RLZTracker::GetAccessPointHttpHeader( | 835 params.extra_headers = RLZTracker::GetAccessPointHttpHeader( |
| 836 RLZTracker::CHROME_HOME_PAGE); | 836 RLZTracker::CHROME_HOME_PAGE); |
| 837 } | 837 } |
| 838 #endif | 838 #endif |
| 839 | 839 |
| 840 chrome::Navigate(¶ms); | 840 chrome::Navigate(¶ms); |
| 841 | 841 |
| 842 first_tab = false; | 842 first_tab = false; |
| 843 } | 843 } |
| 844 if (!browser->tab_strip_model()->GetActiveWebContents()) { | 844 if (!browser->tab_strip_model()->GetActiveWebContents()) { |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 965 } | 965 } |
| 966 | 966 |
| 967 #if !defined(OS_WIN) | 967 #if !defined(OS_WIN) |
| 968 // static | 968 // static |
| 969 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 969 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
| 970 Profile* profile, | 970 Profile* profile, |
| 971 const std::vector<GURL>& startup_urls) { | 971 const std::vector<GURL>& startup_urls) { |
| 972 return false; | 972 return false; |
| 973 } | 973 } |
| 974 #endif | 974 #endif |
| OLD | NEW |