Disable sync promo when RestoreOnStartupURLs policy is used

chrome/browser/ui/webui/sync_promo/sync_promo_ui.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/webui/sync_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 154 matching lines @@
 
   // For Chinese users skip the sync promo.
   if (g_browser_process->GetApplicationLocale() == "zh-CN")
     return false;
 
   PrefService* prefs = profile->GetPrefs();
   int show_count = prefs->GetInteger(prefs::kSyncPromoStartupCount);
   if (show_count >= kSyncPromoShowAtStartupMaximum)
     return false;
 
-  // This pref can be set in the master preferences file to allow or disallow
-  // showing the sync promo at startup.
+  // Check whether the sync promo has been disabled by a pref. This will always
+  // automatically be the case when the RestoreOnStartupURLs policy is set.

[Mattias Nissler (ping if slow), 2012/05/22 14:58:41]

Please retain the master_preferences reference in the comment.

[bartfab (slow), 2012/05/22 15:30:54]

Done.

   if (prefs->HasPrefPath(prefs::kSyncPromoShowOnFirstRunAllowed))
     return prefs->GetBoolean(prefs::kSyncPromoShowOnFirstRunAllowed);
 
   // For now don't show the promo for some brands.
   if (!AllowPromoAtStartupForCurrentBrand())
     return false;
 
   // Default to show the promo for Google Chrome builds.
 #if defined(GOOGLE_CHROME_BUILD)
   return true;
@@ skipping 52 matching lines @@
   if (chrome_common_net::GetValueForKeyInQuery(
           url, kSyncPromoQueryKeySource, &value)) {
     int source = 0;
     if (base::StringToInt(value, &source) && source >= SOURCE_START_PAGE &&
         source < SOURCE_UNKNOWN) {
       return static_cast<Source>(source);
     }
   }
   return SOURCE_UNKNOWN;
 }