Clean up straggler classes to use embedded signin in page in the new profiles world.

chrome/browser/ui/views/sync/one_click_signin_bubble_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/ui/views/sync/one_click_signin_bubble_view.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
-#include "chrome/browser/ui/sync/one_click_signin_histogram.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/google/core/browser/google_util.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/image_button.h"
@@ skipping 181 matching lines @@
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, COLUMN_SET_CONTROLS);
 
   InitLearnMoreLink();
   layout->AddView(learn_more_link_);
 }
 
 void OneClickSigninBubbleView::InitDialogContent(views::GridLayout* layout) {
   OneClickSigninHelper::LogConfirmHistogramValue(
-      one_click_signin::HISTOGRAM_CONFIRM_SHOWN);
+      signin_metrics::HISTOGRAM_CONFIRM_SHOWN);
 
   // Column set for title bar.
   views::ColumnSet* cs = layout->AddColumnSet(COLUMN_SET_TITLE_BAR);
   cs->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(1, views::kUnrelatedControlHorizontalSpacing);
   cs->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ skipping 91 matching lines @@
 bool OneClickSigninBubbleView::AcceleratorPressed(
   const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_RETURN ||
       accelerator.key_code() == ui::VKEY_ESCAPE) {
     OneClickSigninBubbleView::Hide();
 
     if (is_sync_dialog_) {
       if (accelerator.key_code() == ui::VKEY_RETURN) {
         OneClickSigninHelper::LogConfirmHistogramValue(
         clicked_learn_more_ ?
-            one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_RETURN :
-            one_click_signin::HISTOGRAM_CONFIRM_RETURN);
+            signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_RETURN :
+            signin_metrics::HISTOGRAM_CONFIRM_RETURN);
 
         base::ResetAndReturn(&start_sync_callback_).Run(
             OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
       } else if (accelerator.key_code() == ui::VKEY_ESCAPE) {
         OneClickSigninHelper::LogConfirmHistogramValue(
         clicked_learn_more_ ?
-            one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_ESCAPE :
-            one_click_signin::HISTOGRAM_CONFIRM_ESCAPE);
+            signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_ESCAPE :
+            signin_metrics::HISTOGRAM_CONFIRM_ESCAPE);
 
         base::ResetAndReturn(&start_sync_callback_).Run(
             OneClickSigninSyncStarter::UNDO_SYNC);
       }
     }
 
     return true;
   }
 
   return BubbleDelegateView::AcceleratorPressed(accelerator);
 }
 
 void OneClickSigninBubbleView::LinkClicked(views::Link* source,
                                            int event_flags) {
   if (source == learn_more_link_) {
     if (is_sync_dialog_ && !clicked_learn_more_) {
       OneClickSigninHelper::LogConfirmHistogramValue(
-          one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE);
+          signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE);
       clicked_learn_more_ = true;
     }
     delegate_->OnLearnMoreLinkClicked(is_sync_dialog_);
 
     // don't hide the modal dialog, as this is an informational link
     if (is_sync_dialog_)
       return;
   } else if (advanced_link_ && source == advanced_link_) {
     if (is_sync_dialog_) {
       OneClickSigninHelper::LogConfirmHistogramValue(
         clicked_learn_more_ ?
-            one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_ADVANCED :
-            one_click_signin::HISTOGRAM_CONFIRM_ADVANCED);
+            signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_ADVANCED :
+            signin_metrics::HISTOGRAM_CONFIRM_ADVANCED);
 
       base::ResetAndReturn(&start_sync_callback_).Run(
           OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
     } else {
       delegate_->OnAdvancedLinkClicked();
     }
   }
 
   Hide();
 }
 
 void OneClickSigninBubbleView::ButtonPressed(views::Button* sender,
                                              const ui::Event& event) {
   Hide();
 
   if (is_sync_dialog_) {
     if (sender == ok_button_)
       OneClickSigninHelper::LogConfirmHistogramValue(
           clicked_learn_more_ ?
-              one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_OK :
-              one_click_signin::HISTOGRAM_CONFIRM_OK);
+              signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_OK :
+              signin_metrics::HISTOGRAM_CONFIRM_OK);
 
     if (sender == undo_button_)
       OneClickSigninHelper::LogConfirmHistogramValue(
           clicked_learn_more_ ?
-              one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_UNDO :
-              one_click_signin::HISTOGRAM_CONFIRM_UNDO);
+              signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_UNDO :
+              signin_metrics::HISTOGRAM_CONFIRM_UNDO);
 
     if (sender == close_button_)
       OneClickSigninHelper::LogConfirmHistogramValue(
           clicked_learn_more_ ?
-              one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_CLOSE :
-              one_click_signin::HISTOGRAM_CONFIRM_CLOSE);
+              signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_CLOSE :
+              signin_metrics::HISTOGRAM_CONFIRM_CLOSE);
 
     base::ResetAndReturn(&start_sync_callback_).Run((sender == ok_button_) ?
       OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS :
       OneClickSigninSyncStarter::UNDO_SYNC);
   }
 }
 
 void OneClickSigninBubbleView::WindowClosing() {
   // We have to reset |bubble_view_| here, not in our destructor, because
   // we'll be destroyed asynchronously and the shown state will be checked
   // before then.
   DCHECK_EQ(bubble_view_, this);
   bubble_view_ = NULL;
 
   if (is_sync_dialog_ && !start_sync_callback_.is_null()) {
     base::ResetAndReturn(&start_sync_callback_).Run(
         OneClickSigninSyncStarter::UNDO_SYNC);
   }
 }