Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 if (!process_startup && !handled_by_chrome) 766 if (!process_startup && !handled_by_chrome)
767 continue; 767 continue;
768 768
769 int add_types = first_tab ? TabStripModel::ADD_ACTIVE : 769 int add_types = first_tab ? TabStripModel::ADD_ACTIVE :
770 TabStripModel::ADD_NONE; 770 TabStripModel::ADD_NONE;
771 add_types |= TabStripModel::ADD_FORCE_INDEX; 771 add_types |= TabStripModel::ADD_FORCE_INDEX;
772 if (tabs[i].is_pinned) 772 if (tabs[i].is_pinned)
773 add_types |= TabStripModel::ADD_PINNED; 773 add_types |= TabStripModel::ADD_PINNED;
774 774
775 chrome::NavigateParams params(browser, tabs[i].url, 775 chrome::NavigateParams params(browser, tabs[i].url,
776 content::PAGE_TRANSITION_AUTO_TOPLEVEL); 776 ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
777 params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; 777 params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
778 params.tabstrip_add_types = add_types; 778 params.tabstrip_add_types = add_types;
779 params.extension_app_id = tabs[i].app_id; 779 params.extension_app_id = tabs[i].app_id;
780 780
781 #if defined(ENABLE_RLZ) && !defined(OS_IOS) 781 #if defined(ENABLE_RLZ) && !defined(OS_IOS)
782 if (process_startup && google_util::IsGoogleHomePageUrl(tabs[i].url)) { 782 if (process_startup && google_util::IsGoogleHomePageUrl(tabs[i].url)) {
783 params.extra_headers = RLZTracker::GetAccessPointHttpHeader( 783 params.extra_headers = RLZTracker::GetAccessPointHttpHeader(
784 RLZTracker::ChromeHomePage()); 784 RLZTracker::ChromeHomePage());
785 } 785 }
786 #endif // defined(ENABLE_RLZ) && !defined(OS_IOS) 786 #endif // defined(ENABLE_RLZ) && !defined(OS_IOS)
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
907 // behavior is desired because completing or skipping the sync promo 907 // behavior is desired because completing or skipping the sync promo
908 // causes a redirect to the NTP. 908 // causes a redirect to the NTP.
909 if (!startup_urls->empty() && 909 if (!startup_urls->empty() &&
910 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL)) 910 startup_urls->at(0) == GURL(chrome::kChromeUINewTabURL))
911 startup_urls->at(0) = sync_promo_url; 911 startup_urls->at(0) = sync_promo_url;
912 else 912 else
913 startup_urls->insert(startup_urls->begin(), sync_promo_url); 913 startup_urls->insert(startup_urls->begin(), sync_promo_url);
914 } 914 }
915 } 915 }
916 } 916 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698