Disable sync promo for Chromium builds

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 120 matching lines @@
   sync_promo_trial::RecordUserShownPromo(web_ui);
 }
 
 // static
 bool SyncPromoUI::HasShownPromoAtStartup(Profile* profile) {
   return profile->GetPrefs()->HasPrefPath(prefs::kSyncPromoStartupCount);
 }
 
 // static
 bool SyncPromoUI::ShouldShowSyncPromo(Profile* profile) {
 #if defined(OS_CHROMEOS)

[Dan Beam, 2012/01/30 23:16:40]

Why not here?

#if defined(OS_CHROMEOS) || !defined(GOOGLE_CHROME_BUILD)

[sail, 2012/01/30 23:24:21]

Doing it lower allows us to enable it using a command line flag. This is useful
for testing.

   // There's no need to show the sync promo on cros since cros users are logged
   // into sync already.
   return false;
 #endif
 
   // Honor the sync policies.
   if (!profile->GetOriginalProfile()->IsSyncAccessible())
     return false;
 
   // If the user is already signed into sync then don't show the promo.
@@ skipping 60 matching lines @@
 
   // This pref can be set in the master preferences file to allow or disallow
   // showing the sync promo at startup.
   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.
+  // Default to show the promo for Google Chrome builds.
+#if defined(GOOGLE_CHROME_BUILD)
   return true;
+#else
+  return false;
+#endif
 }
 
 void SyncPromoUI::DidShowSyncPromoAtStartup(Profile* profile) {
   int show_count = profile->GetPrefs()->GetInteger(
       prefs::kSyncPromoStartupCount);
   show_count++;
   profile->GetPrefs()->SetInteger(prefs::kSyncPromoStartupCount, show_count);
 }
 
 bool SyncPromoUI::HasUserSkippedSyncPromo(Profile* profile) {
@@ skipping 56 matching lines @@
 }
 
 // static
 bool SyncPromoUI::UserHasSeenSyncPromoAtStartup(Profile* profile) {
   return profile->GetPrefs()->GetInteger(prefs::kSyncPromoStartupCount) > 0;
 }
 
 // static
 int SyncPromoUI::GetSyncPromoVersion() {
   int version = 0;
-  if (base::StringToInt(CommandLine::ForCurrentProcess()->
-      GetSwitchValueASCII(switches::kSyncPromoVersion), &version)) {
-    return version;
-  }
   if (sync_promo_trial::GetSyncPromoVersionForCurrentTrial(&version))
     return version;
   // Default promo version is 0.
   return 0;
 }