Merge 114608, 115692 to 963 (M17) branch.

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()) {
+    bool is_start_up = GetIsLaunchPageForSyncPromoURL(contents->GetURL());
+    sync_promo_trial::RecordUserShownPromoWithTrialBrand(is_start_up, profile);
+  }
 }
 
 // static
+bool SyncPromoUI::HasShownPromoAtStartup(Profile* profile) {
+  return profile->GetPrefs()->HasPrefPath(prefs::kSyncPromoStartupCount);
+}
+
+// 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;
@@ skipping 13 matching lines @@
   prefs->RegisterIntegerPref(
       prefs::kSyncPromoStartupCount, 0, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(
       prefs::kSyncPromoUserSkipped, false, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true,
       PrefService::UNSYNCABLE_PREF);
 
   SyncPromoHandler::RegisterUserPrefs(prefs);
 }
 
+// static
 bool SyncPromoUI::ShouldShowSyncPromoAtStartup(Profile* profile,
                                                bool is_new_profile) {
+  DCHECK(profile);
   if (!ShouldShowSyncPromo(profile))
     return false;
 
   const CommandLine& command_line  = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kNoFirstRun))
     is_new_profile = false;
 
-  PrefService *prefs = profile->GetPrefs();
   if (!is_new_profile) {
-    if (!prefs->HasPrefPath(prefs::kSyncPromoStartupCount))
+    if (!HasShownPromoAtStartup(profile))
       return false;
   }
 
   if (HasUserSkippedSyncPromo(profile))
     return false;
 
   // 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;
 
+  // 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.
@@ skipping 53 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;
 }