yRevert 57093 - dom-ui options: record user metrics for pref changes....

chrome/browser/dom_ui/browser_options_handler.cc

 // Copyright (c) 2010 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/dom_ui/browser_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/dom_ui/options_managed_banner_handler.h"
-#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 BrowserOptionsHandler::BrowserOptionsHandler()
     : template_url_model_(NULL), startup_custom_pages_table_model_(NULL) {
@@ skipping 104 matching lines @@
   else
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
 
   SetDefaultBrowserUIString(status_string_id);
 #else
   default_browser_worker_->StartCheckDefaultBrowser();
 #endif
 }
 
 void BrowserOptionsHandler::BecomeDefaultBrowser(const ListValue* args) {
-  UserMetricsRecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"),
-                          NULL);
 #if defined(OS_MACOSX)
   if (ShellIntegration::SetAsDefaultBrowser())
     UpdateDefaultBrowserState();
 #else
   default_browser_worker_->StartSetAsDefaultBrowser();
   // Callback takes care of updating UI.
 #endif
 }
 
 int BrowserOptionsHandler::StatusStringIdForState(
@@ skipping 67 matching lines @@
   if (!ExtractIntegerValue(args, &selected_index)) {
     NOTREACHED();
     return;
   }
 
   std::vector<const TemplateURL*> model_urls =
       template_url_model_->GetTemplateURLs();
   if (selected_index >= 0 &&
       selected_index < static_cast<int>(model_urls.size()))
     template_url_model_->SetDefaultSearchProvider(model_urls[selected_index]);
-
-  UserMetricsRecordAction(UserMetricsAction("Options_SearchEngineChanged"),
-                          NULL);
 }
 
 void BrowserOptionsHandler::UpdateSearchEngines() {
   template_url_model_ = dom_ui_->GetProfile()->GetTemplateURLModel();
   if (template_url_model_) {
     template_url_model_->Load();
     template_url_model_->AddObserver(this);
     OnTemplateURLModelChanged();
   }
 }
@@ skipping 89 matching lines @@
 }
 
 void BrowserOptionsHandler::SaveStartupPagesPref() {
   PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   pref.urls = startup_custom_pages_table_model_->GetURLs();
 
   SessionStartupPref::SetStartupPref(prefs, pref);
 }