Do not show sync promo when RestoreOnStartupURLs policy is set

chrome/browser/ui/startup/startup_browser_creator_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "apps/app_restore_service.h"
@@ skipping 254 matching lines @@
     }
   }
 }
 
 bool IsNewTabURL(Profile* profile, const GURL& url) {
   GURL ntp_url(chrome::kChromeUINewTabURL);
   return url == ntp_url ||
          (url.is_empty() && profile->GetHomePage() == ntp_url);
 }
 
-void AddSyncPromoTab(Profile* profile, StartupTabs* tabs) {
-  SyncPromoUI::DidShowSyncPromoAtStartup(profile);
-
-  StartupTab sync_promo_tab;
-  sync_promo_tab.url = SyncPromoUI::GetSyncPromoURL(
-      SyncPromoUI::SOURCE_START_PAGE, false);
-  sync_promo_tab.is_pinned = false;
-
-  // No need to add if the sync promo is already in the startup list.
-  for (StartupTabs::const_iterator it = tabs->begin(); it != tabs->end();
-       ++it) {
-    if (it->url == sync_promo_tab.url)
-      return;
-  }
-
-  tabs->insert(tabs->begin(), sync_promo_tab);
-
-  // If the next URL is the NTP then remove it, effectively replacing the NTP
-  // with the sync promo. This behavior is desired because completing or
-  // skipping the sync promo causes a redirect to the NTP.
-  if (tabs->size() > 1 && IsNewTabURL(profile, tabs->at(1).url))
-    tabs->erase(tabs->begin() + 1);
-}
-
 class WebContentsCloseObserver : public content::NotificationObserver {
  public:
   WebContentsCloseObserver() : contents_(NULL) {}
   virtual ~WebContentsCloseObserver() {}
 
   void SetContents(content::WebContents* contents) {
     DCHECK(!contents_);
     contents_ = contents;
 
     registrar_.Add(this,
@@ skipping 447 matching lines @@
     // Only use the set of urls specified in preferences if nothing was
     // specified on the command line. Filter out any urls that are to be
     // restored by virtue of having been previously pinned.
     AddUniqueURLs(pref.urls, &tabs);
   } else if (pref.type == SessionStartupPref::HOMEPAGE) {
     // If 'homepage' selected, either by the user or by a policy, we should
     // have migrated them to another value.
     NOTREACHED() << "SessionStartupPref has deprecated type HOMEPAGE";
   }
 
-  if (pref.type != SessionStartupPref::LAST &&
-      SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) {
-    AddSyncPromoTab(profile_, &tabs);
-  }
-
   if (tabs.empty())
     return NULL;
 
   Browser* browser = OpenTabsInBrowser(NULL, true, tabs, desktop_type);
   return browser;
 }
 
 void StartupBrowserCreatorImpl::AddUniqueURLs(const std::vector<GURL>& urls,
                                               StartupTabs* tabs) {
   size_t num_existing_tabs = tabs->size();
@@ skipping 142 matching lines @@
            (browser_creator_ &&
             browser_creator_->is_default_browser_dialog_suppressed())) &&
           !chrome::ShowAutolaunchPrompt(browser)) {
         chrome::ShowDefaultBrowserPrompt(profile_,
                                          browser->host_desktop_type());
       }
     }
   }
 }
 
-
 void StartupBrowserCreatorImpl::AddStartupURLs(
     std::vector<GURL>* startup_urls) const {
+  // TODO(atwilson): Simplify the logic that decides which tabs to open on
+  // start-up and make it more consistent. http://crbug.com/248883
+
   // If we have urls specified by the first run master preferences use them
   // and nothing else.
   if (browser_creator_ && startup_urls->empty()) {
     if (!browser_creator_->first_run_tabs_.empty()) {
       std::vector<GURL>::iterator it =
           browser_creator_->first_run_tabs_.begin();
       while (it != browser_creator_->first_run_tabs_.end()) {
         // Replace magic names for the actual urls.
         if (it->host() == "new_tab_page") {
           startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
         } else if (it->host() == "welcome_page") {
           startup_urls->push_back(internals::GetWelcomePageURL());
         } else {
           startup_urls->push_back(*it);
         }
         ++it;
       }
       browser_creator_->first_run_tabs_.clear();
     }
   }
 
   // Otherwise open at least the new tab page (and the welcome page, if this
   // is the first time the browser is being started), or the set of URLs
   // specified on the command line.
   if (startup_urls->empty()) {
     startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
     if (first_run::ShouldShowWelcomePage())
       startup_urls->push_back(internals::GetWelcomePageURL());
   }
+
+  if (SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) {
+    SyncPromoUI::DidShowSyncPromoAtStartup(profile_);
+
+    const GURL sync_promo_url = SyncPromoUI::GetSyncPromoURL(
+        SyncPromoUI::SOURCE_START_PAGE, false);
+
+    // No need to add if the sync promo is already in the startup list.
+    bool add_promo = true;
+    for (std::vector<GURL>::const_iterator it = startup_urls->begin();
+         it != startup_urls->end(); ++it) {
+      if (*it == sync_promo_url) {
+        add_promo = false;
+        break;
+      }
+    }
+
+    if (add_promo) {
+      // If the first URL is the NTP, replace it with the sync promo. This
+      // behavior is desired because completing or skipping the sync promo
+      // causes a redirect to the NTP.
+      if (!startup_urls->empty() && IsNewTabURL(profile_, startup_urls->at(0)))
+        startup_urls->at(0) = sync_promo_url;
+      else
+        startup_urls->insert(startup_urls->begin(), sync_promo_url);
+    }
+  }
 }
 
 #if !defined(OS_WIN)
 // static
 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
     Profile* profile,
     const std::vector<GURL>& startup_urls) {
   return false;
 }
 #endif