Merge 114608, 115692 to 963 (M17) branch.

chrome/browser/ui/webui/sync_promo/sync_promo_handler.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_handler.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/time.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/sync/sync_setup_flow.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/webui/sync_promo_trial.h"
-#include "chrome/browser/ui/webui/sync_promo_ui.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
+#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 
 namespace {
 
@@ skipping 85 matching lines @@
   web_ui_->RegisterMessageCallback("SyncPromo:UserFlowAction",
       base::Bind(&SyncPromoHandler::HandleUserFlowAction,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncPromo:UserSkipped",
       base::Bind(&SyncPromoHandler::HandleUserSkipped,
                  base::Unretained(this)));
   SyncSetupHandler::RegisterMessages();
 }
 
 void SyncPromoHandler::ShowGaiaSuccessAndClose() {
-  if (sync_promo_trial::IsExperimentActive())
-    sync_promo_trial::RecordUserSignedIn();
-
+  RecordExperimentOutcomesOnSignIn();
   SyncSetupHandler::ShowGaiaSuccessAndClose();
 }
 
 void SyncPromoHandler::ShowGaiaSuccessAndSettingUp() {
-  if (sync_promo_trial::IsExperimentActive())
-    sync_promo_trial::RecordUserSignedIn();
-
+  RecordExperimentOutcomesOnSignIn();
   SyncSetupHandler::ShowGaiaSuccessAndSettingUp();
 }
 
 void SyncPromoHandler::ShowConfigure(const base::DictionaryValue& args) {
   bool usePassphrase = false;
   args.GetBoolean("usePassphrase", &usePassphrase);
 
   if (usePassphrase) {
     // If a passphrase is required then we must show the configure pane.
     SyncSetupHandler::ShowConfigure(args);
@@ skipping 31 matching lines @@
     default: {
       NOTREACHED();
     }
   }
 }
 
 void SyncPromoHandler::StepWizardForShowSetupUI() {
 }
 
 void SyncPromoHandler::ShowSetupUI() {
-   // SyncSetupWizard::Step should be called in StepWizardForShowSetupUI above,
-   // but it causes the sync promo page to not set focus properly to the login
-   // email address. This happens because focus is lost between the call to
-   // StepWizardForShowSetupUI and ShowSetupUI.
-   // TODO(binji): Move this function back and fix the focus the right way.
+  // SyncSetupWizard::Step should be called in StepWizardForShowSetupUI above,
+  // but it causes the sync promo page to not set focus properly to the login
+  // email address. This happens because focus is lost between the call to
+  // StepWizardForShowSetupUI and ShowSetupUI.
+  // TODO(binji): Move this function back and fix the focus the right way.
   ProfileSyncService* service =
       Profile::FromWebUI(web_ui_)->GetProfileSyncService();
   service->get_wizard().Step(SyncSetupWizard::GetLoginState());
 }
 
 void SyncPromoHandler::HandleCloseSyncPromo(const base::ListValue* args) {
   CloseSyncSetup();
 
   // If the user has signed in then set the pref to show them NTP bubble
   // confirming that they're signed in.
@@ skipping 68 matching lines @@
 void SyncPromoHandler::HandleUserSkipped(const base::ListValue* args) {
   SyncPromoUI::SetUserSkippedSyncPromo(Profile::FromWebUI(web_ui_));
   RecordUserFlowAction(SYNC_PROMO_SKIP_CLICKED);
 }
 
 int SyncPromoHandler::GetViewCount() const {
   // The locally persistent number of times the user has seen the sync promo.
   return prefs_->GetInteger(prefs::kSyncPromoViewCount);
 }
 
-int SyncPromoHandler::IncrementViewCountBy(unsigned int amount) {
+int SyncPromoHandler::IncrementViewCountBy(size_t amount) {
   // Let the user increment by 0 if they really want.  It might be useful for a
   // weird way of sending preference change notifications...
   int adjusted = GetViewCount() + amount;
   prefs_->SetInteger(prefs::kSyncPromoViewCount, adjusted);
   return adjusted;
 }
 
+void SyncPromoHandler::RecordExperimentOutcomesOnSignIn() {
+  if (sync_promo_trial::IsExperimentActive())
+    sync_promo_trial::RecordUserSignedIn();
+  if (sync_promo_trial::IsPartOfBrandTrialToEnable()) {
+    bool is_start_up = SyncPromoUI::GetIsLaunchPageForSyncPromoURL(
+        web_ui_->tab_contents()->GetURL());
+    Profile* profile = Profile::FromWebUI(web_ui_);
+    sync_promo_trial::RecordUserSignedInWithTrialBrand(is_start_up, profile);
+  }
+}
+
 void SyncPromoHandler::RecordUserFlowAction(int action) {
   // Send an enumeration to our single user flow histogram.
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.UserFlow", action,
                             SYNC_PROMO_BUCKET_BOUNDARY);
 }