diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 17:23:14 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 17:23:14 +0000 |
| commit | 76c0f69b2a933abcc3edb5b952834ed952d2463e (patch) | |
| tree | f956084d43fac2162eccd5702c4768b8861b96b5 /chrome/browser/ui/browser_init.cc | |
| parent | 46a6eb9a94fe9b9ba8e2ac0e9edf03a07f290fa5 (diff) | |
| download | chromium_src-76c0f69b2a933abcc3edb5b952834ed952d2463e.zip chromium_src-76c0f69b2a933abcc3edb5b952834ed952d2463e.tar.gz chromium_src-76c0f69b2a933abcc3edb5b952834ed952d2463e.tar.bz2 | |
Sync Promo: Insert promo page before startup tabs
The previous code swapped out the new tab page with the promo page on startup. With this change we now simply insert the promo page at the beginning of the list of startup pages.
BUG=99743
TEST=
Review URL: http://codereview.chromium.org/8241001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_init.cc')
| -rw-r--r-- | chrome/browser/ui/browser_init.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 5e98d52..63341a9 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -1261,17 +1261,17 @@ void BrowserInit::LaunchWithProfile::AddStartupURLs( // and nothing else. if (browser_init_) { if (!browser_init_->first_run_tabs_.empty()) { + // Sync promo comes first. + if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) { + SyncPromoUI::DidShowSyncPromoAtStartup(profile_); + startup_urls->push_back(GURL(chrome::kChromeUISyncPromoURL)); + } + std::vector<GURL>::iterator it = browser_init_->first_run_tabs_.begin(); while (it != browser_init_->first_run_tabs_.end()) { // Replace magic names for the actual urls. if (it->host() == "new_tab_page") { - if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, - is_first_run_)) { - SyncPromoUI::DidShowSyncPromoAtStartup(profile_); - startup_urls->push_back(GURL(chrome::kChromeUISyncPromoURL)); - } else { - startup_urls->push_back(GURL(chrome::kChromeUINewTabURL)); - } + startup_urls->push_back(GURL(chrome::kChromeUINewTabURL)); } else if (it->host() == "welcome_page") { startup_urls->push_back(GetWelcomePageURL()); } else { @@ -1290,9 +1290,8 @@ void BrowserInit::LaunchWithProfile::AddStartupURLs( if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) { SyncPromoUI::DidShowSyncPromoAtStartup(profile_); startup_urls->push_back(GURL(chrome::kChromeUISyncPromoURL)); - } else { - startup_urls->push_back(GURL()); // New tab page. } + startup_urls->push_back(GURL()); // New tab page. PrefService* prefs = g_browser_process->local_state(); if (prefs->FindPreference(prefs::kShouldShowWelcomePage) && prefs->GetBoolean(prefs::kShouldShowWelcomePage)) { |