[Sync Promo UI] Changing sync promo to honor brand codes.

chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc

 // Copyright (c) 2011 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_ui.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/options/core_options_handler.h"
-#include "chrome/browser/ui/webui/sync_promo_handler.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "googleurl/src/url_util.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 85 matching lines @@
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   ThemeSource* theme = new ThemeSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(theme);
 
   // Set up the sync promo source.
   SyncPromoUIHTMLSource* html_source = new SyncPromoUIHTMLSource(this);
   html_source->set_json_path(kStringsJsFile);
   html_source->add_resource_path(kSyncPromoJsFile, IDR_SYNC_PROMO_JS);
   html_source->set_default_resource(IDR_SYNC_PROMO_HTML);
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
+
+  if (sync_promo_trial::IsPartOfBrandTrialToEnable())
+    sync_promo_trial::RecordUserShownPromoWithTrialBrand();
 }
 
 // static
 bool SyncPromoUI::ShouldShowSyncPromo(Profile* profile) {
 #if defined(OS_CHROMEOS)
   // 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.
   ProfileSyncService* service =
       profile->GetOriginalProfile()->GetProfileSyncService();
   if (!service || service->HasSyncSetupCompleted())
     return false;
 
   // Default to allow the promo.
   return true;

[Dan Beam, 2011/12/14 05:14:25]

This will be:

  return false;

on M16, btw (http://goo.gl/uBgLB).

 }
 
 // static
 void SyncPromoUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(
       prefs::kSyncPromoStartupCount, 0, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(
       prefs::kSyncPromoUserSkipped, false, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true,
       PrefService::UNSYNCABLE_PREF);
@@ skipping 20 matching lines @@
     return false;
 
   // For Chinese users skip the sync promo.
   if (g_browser_process->GetApplicationLocale() == "zh-CN")
     return false;
 
   int show_count = prefs->GetInteger(prefs::kSyncPromoStartupCount);
   if (show_count >= kSyncPromoShowAtStartupMaximum)
     return false;
 
+  // If the current install has a brand code that's part of an experiment, honor
+  // that before master prefs.
+  if (sync_promo_trial::IsPartOfBrandTrialToEnable())
+    return sync_promo_trial::ShouldShowAtStartupBasedOnBrand();
+
   // 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.
-  return true;
+  return false;
 }
 
 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 42 matching lines @@
     UTF16ToUTF8(output.data(), output.length(), &url);
     return GURL(url);
   }
   return GURL();
 }
 
 // static
 bool SyncPromoUI::UserHasSeenSyncPromoAtStartup(Profile* profile) {
   return profile->GetPrefs()->GetInteger(prefs::kSyncPromoStartupCount) > 0;
 }