Pulling user experiment code from BrowserDistribution to a new class.

chrome/browser/first_run/try_chrome_dialog_view.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/first_run/try_chrome_dialog_view.h"
 
 #include <shellapi.h>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "chrome/browser/process_singleton.h"
-#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/user_experiment.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/radio_button.h"
@@ skipping 143 matching lines @@
                      views::GridLayout::USE_PREF, 0, 0);
   columns->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing);
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL, 1,
                      views::GridLayout::USE_PREF, 0, 0);
 
   // First row.
   layout->StartRow(0, 0);
   layout->AddView(icon);
 
   // Find out what experiment we are conducting.
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  if (!dist) {
-    NOTREACHED() << "Cannot determine browser distribution";
-    return DIALOG_ERROR;
-  }
-  BrowserDistribution::UserExperiment experiment;
-  if (!dist->GetExperimentDetails(&experiment, flavor_) ||
+  installer::ExperimentDetails experiment;
+  if (!installer::CreateExperimentDetails(flavor_, &experiment) ||

[grt (UTC plus 2), 2013/03/12 19:36:18]

  if (!BrowserDistribution::GetDistribution()->HasUserExperiments() ||
      !installer::CreateExperimentDetails(flavor_, &experiment) ||
      !experiment.heading) {

[huangs, 2013/03/14 17:20:45]

Done.

       !experiment.heading) {
     NOTREACHED() << "Cannot determine which headline to show.";
     return DIALOG_ERROR;
   }
   views::Label* label = new views::Label(
       l10n_util::GetStringUTF16(experiment.heading));
   label->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
   label->SetMultiLine(true);
   label->SizeToFit(200);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ skipping 13 matching lines @@
   layout->StartRowWithPadding(0, 1, 0, 10);
   try_chrome_ = new views::RadioButton(
       l10n_util::GetStringUTF16(IDS_TRY_TOAST_TRY_OPT), kRadioGroupID);
   try_chrome_->SetChecked(true);
   try_chrome_->set_tag(BT_TRY_IT_RADIO);
   try_chrome_->set_listener(this);
   layout->AddView(try_chrome_);
 
   // Decide if the don't bug me is a button or a radio button.
   bool dont_bug_me_button =
-      ((experiment.flags & BrowserDistribution::kDontBugMeAsButton) != 0);
+      !!(experiment.flags & installer::kToastUiDontBugMeAsButton);
 
   // Optional third and fourth row.
   if (!dont_bug_me_button) {
     layout->StartRow(0, 1);
     dont_try_chrome_ = new views::RadioButton(
         l10n_util::GetStringUTF16(IDS_TRY_TOAST_CANCEL), kRadioGroupID);
     dont_try_chrome_->set_tag(BT_DONT_BUG_RADIO);
     dont_try_chrome_->set_listener(this);
     layout->AddView(dont_try_chrome_);
   }
-  if (experiment.flags & BrowserDistribution::kUninstall) {
+  if (experiment.flags & installer::kToastUiUninstall) {
     layout->StartRow(0, 2);
     kill_chrome_ = new views::RadioButton(
         l10n_util::GetStringUTF16(IDS_UNINSTALL_CHROME), kRadioGroupID);
     layout->AddView(kill_chrome_);
   }
 
   views::Button* accept_button = new views::NativeTextButton(
       this, l10n_util::GetStringUTF16(IDS_OK));
   accept_button->set_tag(BT_OK_BUTTON);
 
   views::Separator* separator = NULL;
-  if (experiment.flags & BrowserDistribution::kMakeDefault) {
+  if (experiment.flags & installer::kToastUiMakeDefault) {
     // In this flavor we have some veritical space, then a separator line
     // and the 'make default' checkbox and the OK button on the same row.
     layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
     layout->StartRow(0, 6);
     separator = new views::Separator;
     layout->AddView(separator);
     layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
     layout->StartRow(0, 7);
     make_default_ = new views::Checkbox(
         l10n_util::GetStringUTF16(IDS_TRY_TOAST_SET_DEFAULT));
     make_default_->SetChecked(true);
     layout->AddView(make_default_);
     layout->AddView(accept_button);
   } else {
     // On this other flavor there is no checkbox, the OK button and possibly
     // the cancel button are in the same row.
     layout->StartRowWithPadding(0, dont_bug_me_button ? 3 : 5, 0, 10);
     layout->AddView(accept_button);
     if (dont_bug_me_button) {
       // The dialog needs a "Don't bug me" as a button or as a radio button,
       // this the button case.
       views::Button* cancel_button = new views::NativeTextButton(
           this, l10n_util::GetStringUTF16(IDS_TRY_TOAST_CANCEL));
       cancel_button->set_tag(BT_CLOSE_BUTTON);
       layout->AddView(cancel_button);
     }
   }
 
-  if (experiment.flags & BrowserDistribution::kWhyLink) {
+  if (experiment.flags & installer::kToastUiWhyLink) {
     layout->StartRowWithPadding(0, 4, 0, 10);
     views::Link* link = new views::Link(
         l10n_util::GetStringUTF16(IDS_TRY_TOAST_WHY));
     link->set_listener(this);
     layout->AddView(link);
   }
 
   // We resize the window according to the layout manager. This takes into
   // account the differences between XP and Vista fonts and buttons.
   layout->Layout(root_view);
@@ skipping 94 matching lines @@
         result_ = TRY_CHROME_AS_DEFAULT;
   }
 
   popup_->Close();
   MessageLoop::current()->Quit();
 }
 
 void TryChromeDialogView::LinkClicked(views::Link* source, int event_flags) {
   ::ShellExecuteW(NULL, L"open", kHelpCenterUrl, NULL, NULL, SW_SHOW);
 }