Move network settings metrics to JS

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 31 matching lines @@
 #include "chromeos/network/network_profile.h"
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translation_tables.h"
 #include "chromeos/network/onc/onc_translator.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "components/onc/onc_constants.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/ui_chromeos_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/chromeos/network/network_icon.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
@@ skipping 336 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kChangePinMessage,
       base::Bind(&InternetOptionsHandler::ChangePinCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kSetServerHostname,
       base::Bind(&InternetOptionsHandler::SetServerHostnameCallback,
                  base::Unretained(this)));
 }
 
 void InternetOptionsHandler::EnableWifiCallback(const base::ListValue* args) {
-  content::RecordAction(base::UserMetricsAction("Options_NetworkWifiToggle"));
   NetworkHandler::Get()->network_state_handler()->SetTechnologyEnabled(
       NetworkTypePattern::WiFi(), true,
       base::Bind(&ShillError, "EnableWifiCallback"));
 }
 
 void InternetOptionsHandler::DisableWifiCallback(const base::ListValue* args) {
-  content::RecordAction(base::UserMetricsAction("Options_NetworkWifiToggle"));
   NetworkHandler::Get()->network_state_handler()->SetTechnologyEnabled(
       NetworkTypePattern::WiFi(), false,
       base::Bind(&ShillError, "DisableWifiCallback"));
 }
 
 void InternetOptionsHandler::EnableCellularCallback(
     const base::ListValue* args) {
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   const DeviceState* device =
       handler->GetDeviceStateByType(NetworkTypePattern::Cellular());
@@ skipping 278 matching lines @@
 
 void InternetOptionsHandler::SetPreferNetworkCallback(
     const base::ListValue* args) {
   std::string service_path, prefer_network_str;
   if (args->GetSize() < 2 ||
       !args->GetString(0, &service_path) ||
       !args->GetString(1, &prefer_network_str)) {
     NOTREACHED();
     return;
   }
-  content::RecordAction(base::UserMetricsAction("Options_NetworkSetPrefer"));
   int priority = (prefer_network_str == kTagTrue) ? kPreferredPriority : 0;
   SetNetworkProperty(service_path,
                      shill::kPriorityProperty,
                      new base::FundamentalValue(priority));
 }
 
 void InternetOptionsHandler::SetAutoConnectCallback(
     const base::ListValue* args) {
   std::string service_path, auto_connect_str;
   if (args->GetSize() < 2 ||
       !args->GetString(0, &service_path) ||
       !args->GetString(1, &auto_connect_str)) {
     NOTREACHED();
     return;
   }
-  content::RecordAction(base::UserMetricsAction("Options_NetworkAutoConnect"));
   bool auto_connect = auto_connect_str == kTagTrue;
   SetNetworkProperty(service_path,
                      shill::kAutoConnectProperty,
                      new base::FundamentalValue(auto_connect));
 }
 
 void InternetOptionsHandler::SetIPConfigCallback(const base::ListValue* args) {
   std::string service_path;
   if (!args->GetString(0, &service_path)) {
     NOTREACHED();
@@ skipping 101 matching lines @@
   if (!network) {
     LOG(ERROR) << "Network properties not found: " << service_path;
     return;
   }
 
   details_path_ = service_path;
 
   scoped_ptr<base::DictionaryValue> dictionary =
       PopulateConnectionDetails(network, onc_properties);
 
-  if (network->Matches(NetworkTypePattern::WiFi())) {
-    content::RecordAction(
-        base::UserMetricsAction("Options_NetworkShowDetailsWifi"));
-    if (network->IsConnectedState()) {
-      content::RecordAction(
-          base::UserMetricsAction("Options_NetworkShowDetailsWifiConnected"));
-    }
-  } else if (network->Matches(NetworkTypePattern::VPN())) {
-    content::RecordAction(
-        base::UserMetricsAction("Options_NetworkShowDetailsVPN"));
-    if (network->IsConnectedState()) {
-      content::RecordAction(
-          base::UserMetricsAction("Options_NetworkShowDetailsVPNConnected"));
-    }
-  } else if (network->Matches(NetworkTypePattern::Cellular())) {
-    content::RecordAction(
-        base::UserMetricsAction("Options_NetworkShowDetailsCellular"));
-    if (network->IsConnectedState()) {
-      content::RecordAction(base::UserMetricsAction(
-          "Options_NetworkShowDetailsCellularConnected"));
-    }
-  }
-
   // Show details dialog
   web_ui()->CallJavascriptFunction(kShowDetailedInfoFunction, *dictionary);
 }
 
 gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const {
   return web_ui()->GetWebContents()->GetTopLevelNativeWindow();
 }
 
 float InternetOptionsHandler::GetScaleFactor() const {
   return web_ui()->GetDeviceScaleFactor();
@@ skipping 34 matching lines @@
     NetworkHandler::Get()
         ->managed_network_configuration_handler()
         ->GetManagedProperties(
             LoginState::Get()->primary_user_hash(),
             service_path,
             base::Bind(
                 &InternetOptionsHandler::PopulateDictionaryDetailsCallback,
                 weak_factory_.GetWeakPtr()),
             base::Bind(&ShillError, "NetworkCommand: " + command));
   } else if (command == kTagConnect) {
-    const NetworkState* network = GetNetworkState(service_path);
-    if (network && network->type() == shill::kTypeWifi)
-      content::RecordAction(
-          base::UserMetricsAction("Options_NetworkConnectToWifi"));
-    else if (network && network->type() == shill::kTypeVPN)
-      content::RecordAction(
-          base::UserMetricsAction("Options_NetworkConnectToVPN"));
     ash::network_connect::ConnectToNetwork(service_path, GetNativeWindow());
   } else if (command == kTagDisconnect) {
-    const NetworkState* network = GetNetworkState(service_path);
-    if (network && network->type() == shill::kTypeWifi)
-      content::RecordAction(
-          base::UserMetricsAction("Options_NetworkDisconnectWifi"));
-    else if (network && network->type() == shill::kTypeVPN)
-      content::RecordAction(
-          base::UserMetricsAction("Options_NetworkDisconnectVPN"));
     NetworkHandler::Get()->network_connection_handler()->DisconnectNetwork(
         service_path,
         base::Bind(&base::DoNothing),
         base::Bind(&ShillError, "NetworkCommand: " + command));
   } else if (command == kTagConfigure) {
     NetworkConfigView::Show(service_path, GetNativeWindow());
   } else if (command == kTagActivate && type == shill::kTypeCellular) {
     ash::network_connect::ActivateCellular(service_path);
     // Activation may update network properties (e.g. ActivationState), so
     // request them here in case they change.
     UpdateConnectionData(service_path);
   } else {
     VLOG(1) << "Unknown command: " << command;
     NOTREACHED();
   }
 }
 
 void InternetOptionsHandler::AddConnection(const std::string& type) {
   if (type == shill::kTypeWifi) {
-    content::RecordAction(
-        base::UserMetricsAction("Options_NetworkJoinOtherWifi"));
     NetworkConfigView::ShowForType(shill::kTypeWifi, GetNativeWindow());
   } else if (type == shill::kTypeVPN) {
-    content::RecordAction(
-        base::UserMetricsAction("Options_NetworkJoinOtherVPN"));
     NetworkConfigView::ShowForType(shill::kTypeVPN, GetNativeWindow());
   } else if (type == shill::kTypeCellular) {
     ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
   } else {
     LOG(ERROR) << "Unsupported type for AddConnection";
   }
 }
 
 base::ListValue* InternetOptionsHandler::GetWiredList() {
   base::ListValue* list = new base::ListValue();
@@ skipping 88 matching lines @@
   dictionary->SetBoolean(
       kTagWimaxAvailable,
       handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
   dictionary->SetBoolean(
       kTagWimaxEnabled,
       handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
 }
 
 }  // namespace options
 }  // namespace chromeos