Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(774)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 23712002: Cleanup network type matching. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added unit tests and rebased. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/api/dial/dial_service.cc ('K') | « chrome/browser/ui/webui/help/help_utils_chromeos.cc ('k') | chromeos/chromeos.gyp » ('j') | chromeos/network/network_change_notifier_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 2ebaf293d4dc852fe7d7a209b8453555a2d2a4d8..7f8895119d148de054fd036421b89d1a07b34bd8 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -63,6 +63,7 @@
#include "chromeos/network/network_ui_data.h"
#include "chromeos/network/network_util.h"
#include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/shill_property_util.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
@@ -438,7 +439,7 @@ NetworkInfoDictionary::NetworkInfoDictionary(const NetworkState* network,
shared_(false),
activation_state_(network->activation_state()),
policy_managed_(network->IsManaged()) {
- if (network->type() == flimflam::kTypeEthernet)
+ if (network->Matches(NetworkTypePattern::Ethernet()))
name_ = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
gfx::ImageSkia icon = ash::network_icon::GetImageForNetwork(
network, ash::network_icon::ICON_TYPE_LIST);
@@ -456,7 +457,7 @@ NetworkInfoDictionary::NetworkInfoDictionary(const FavoriteState* favorite,
remembered_(true),
shared_(!favorite->IsPrivate()),
policy_managed_(favorite->IsManaged()) {
- if (favorite->type() == flimflam::kTypeEthernet)
+ if (favorite->Matches(NetworkTypePattern::Ethernet()))
name_ = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
gfx::ImageSkia icon = ash::network_icon::GetImageForDisconnectedNetwork(
ash::network_icon::ICON_TYPE_LIST, favorite->type());
@@ -670,7 +671,7 @@ void PopulateVPNDetails(const NetworkState* vpn,
// Disable 'Connect' for VPN unless connected to a non-VPN network.
const NetworkState* connected_network =
NetworkHandler::Get()->network_state_handler()->ConnectedNetworkByType(
- NetworkStateHandler::kMatchTypeNonVirtual);
+ NetworkTypePattern::NonVirtual());
dictionary->SetBoolean(kTagDisableConnectButton, !connected_network);
}
@@ -1029,13 +1030,13 @@ void InternetOptionsHandler::RegisterMessages() {
void InternetOptionsHandler::EnableWifiCallback(const base::ListValue* args) {
NetworkHandler::Get()->network_state_handler()->SetTechnologyEnabled(
- flimflam::kTypeWifi, true,
+ NetworkTypePattern::WiFi(), true,
base::Bind(&ShillError, "EnableWifiCallback"));
}
void InternetOptionsHandler::DisableWifiCallback(const base::ListValue* args) {
NetworkHandler::Get()->network_state_handler()->SetTechnologyEnabled(
- flimflam::kTypeWifi, false,
+ NetworkTypePattern::WiFi(), false,
base::Bind(&ShillError, "DisableWifiCallback"));
}
@@ -1043,7 +1044,7 @@ void InternetOptionsHandler::EnableCellularCallback(
const base::ListValue* args) {
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
const DeviceState* device =
- handler->GetDeviceStateByType(flimflam::kTypeCellular);
+ handler->GetDeviceStateByType(NetworkTypePattern::Cellular());
if (!device) {
LOG(ERROR) << "Mobile device not found.";
return;
@@ -1053,9 +1054,9 @@ void InternetOptionsHandler::EnableCellularCallback(
SimDialogDelegate::SIM_DIALOG_UNLOCK);
return;
}
- if (!handler->IsTechnologyEnabled(flimflam::kTypeCellular)) {
+ if (!handler->IsTechnologyEnabled(NetworkTypePattern::Cellular())) {
handler->SetTechnologyEnabled(
- flimflam::kTypeCellular, true,
+ NetworkTypePattern::Cellular(), true,
base::Bind(&ShillError, "EnableCellularCallback"));
return;
}
@@ -1080,19 +1081,19 @@ void InternetOptionsHandler::EnableCellularCallback(
void InternetOptionsHandler::DisableCellularCallback(
const base::ListValue* args) {
NetworkHandler::Get()->network_state_handler()->SetTechnologyEnabled(
- NetworkStateHandler::kMatchTypeMobile, false,
+ NetworkTypePattern::Mobile(), false,
base::Bind(&ShillError, "DisableCellularCallback"));
}
void InternetOptionsHandler::EnableWimaxCallback(const base::ListValue* args) {
NetworkHandler::Get()->network_state_handler()->SetTechnologyEnabled(
- flimflam::kTypeWimax, true,
+ NetworkTypePattern::Wimax(), true,
base::Bind(&ShillError, "EnableWimaxCallback"));
}
void InternetOptionsHandler::DisableWimaxCallback(const base::ListValue* args) {
NetworkHandler::Get()->network_state_handler()->SetTechnologyEnabled(
- flimflam::kTypeWimax, false,
+ NetworkTypePattern::Wimax(), false,
base::Bind(&ShillError, "DisableWimaxCallback"));
}
@@ -1181,10 +1182,10 @@ void InternetOptionsHandler::SetApnProperties(
void InternetOptionsHandler::CarrierStatusCallback() {
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
const DeviceState* device =
- handler->GetDeviceStateByType(flimflam::kTypeCellular);
+ handler->GetDeviceStateByType(NetworkTypePattern::Cellular());
if (device && (device->carrier() == shill::kCarrierSprint)) {
const NetworkState* network =
- handler->FirstNetworkByType(flimflam::kTypeCellular);
+ handler->FirstNetworkByType(NetworkTypePattern::Cellular());
if (network) {
ash::network_connect::ActivateCellular(network->path());
UpdateConnectionData(network->path());
@@ -1203,7 +1204,7 @@ void InternetOptionsHandler::SetCarrierCallback(const base::ListValue* args) {
return;
}
const DeviceState* device = NetworkHandler::Get()->network_state_handler()->
- GetDeviceStateByType(flimflam::kTypeCellular);
+ GetDeviceStateByType(NetworkTypePattern::Cellular());
if (!device) {
LOG(WARNING) << "SetCarrierCallback with no cellular device.";
return;
@@ -1553,10 +1554,10 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback(
dictionary.SetBoolean(kTagShowProxy, !network->profile_path().empty());
// Enable static ip config for ethernet. For wifi, enable if flag is set.
- bool staticIPConfig = type == flimflam::kTypeEthernet ||
- (type == flimflam::kTypeWifi &&
- CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableStaticIPConfig));
+ bool staticIPConfig = network->Matches(NetworkTypePattern::Ethernet()) ||
+ (type == flimflam::kTypeWifi &&
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kEnableStaticIPConfig));
dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig);
dictionary.SetBoolean(kTagShowPreferred, !network->profile_path().empty());
@@ -1614,7 +1615,7 @@ void PopulateConnectionDetails(const NetworkState* network,
const std::string& type = network->type();
const NetworkState* connected_network =
NetworkHandler::Get()->network_state_handler()->ConnectedNetworkByType(
- type);
+ NetworkTypePattern::Primitive(type));
dictionary->SetBoolean(kTagDeviceConnected, connected_network != NULL);
@@ -1938,7 +1939,7 @@ void InternetOptionsHandler::AddConnection(const std::string& type) {
base::ListValue* InternetOptionsHandler::GetWiredList() {
base::ListValue* list = new base::ListValue();
const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
- FirstNetworkByType(flimflam::kTypeEthernet);
+ FirstNetworkByType(NetworkTypePattern::Ethernet());
if (!network)
return list;
NetworkInfoDictionary network_dict(network, web_ui()->GetDeviceScaleFactor());
@@ -1950,16 +1951,11 @@ base::ListValue* InternetOptionsHandler::GetWirelessList() {
base::ListValue* list = new base::ListValue();
NetworkStateHandler::NetworkStateList networks;
- NetworkHandler::Get()->network_state_handler()->GetNetworkList(&networks);
+ NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
+ NetworkTypePattern::Wireless(), &networks);
for (NetworkStateHandler::NetworkStateList::const_iterator iter =
networks.begin(); iter != networks.end(); ++iter) {
- const NetworkState* network = *iter;
- if (network->type() != flimflam::kTypeWifi &&
- network->type() != flimflam::kTypeWimax &&
- network->type() != flimflam::kTypeCellular)
- continue;
- NetworkInfoDictionary network_dict(
- network, web_ui()->GetDeviceScaleFactor());
+ NetworkInfoDictionary network_dict(*iter, web_ui()->GetDeviceScaleFactor());
list->Append(network_dict.BuildDictionary());
}
@@ -1970,14 +1966,11 @@ base::ListValue* InternetOptionsHandler::GetVPNList() {
base::ListValue* list = new base::ListValue();
NetworkStateHandler::NetworkStateList networks;
- NetworkHandler::Get()->network_state_handler()->GetNetworkList(&networks);
+ NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
+ NetworkTypePattern::VPN(), &networks);
for (NetworkStateHandler::NetworkStateList::const_iterator iter =
networks.begin(); iter != networks.end(); ++iter) {
- const NetworkState* network = *iter;
- if (network->type() != flimflam::kTypeVPN)
- continue;
- NetworkInfoDictionary network_dict(
- network, web_ui()->GetDeviceScaleFactor());
+ NetworkInfoDictionary network_dict(*iter, web_ui()->GetDeviceScaleFactor());
list->Append(network_dict.BuildDictionary());
}
@@ -2011,27 +2004,31 @@ void InternetOptionsHandler::FillNetworkInfo(
dictionary->Set(kTagVpnList, GetVPNList());
dictionary->Set(kTagRememberedList, GetRememberedList());
- dictionary->SetBoolean(kTagWifiAvailable,
- handler->IsTechnologyAvailable(flimflam::kTypeWifi));
- dictionary->SetBoolean(kTagWifiEnabled,
- handler->IsTechnologyEnabled(flimflam::kTypeWifi));
-
- dictionary->SetBoolean(kTagCellularAvailable,
- handler->IsTechnologyAvailable(
- NetworkStateHandler::kMatchTypeMobile));
- dictionary->SetBoolean(kTagCellularEnabled,
- handler->IsTechnologyEnabled(
- NetworkStateHandler::kMatchTypeMobile));
+ dictionary->SetBoolean(
+ kTagWifiAvailable,
+ handler->IsTechnologyAvailable(NetworkTypePattern::WiFi()));
+ dictionary->SetBoolean(
+ kTagWifiEnabled,
+ handler->IsTechnologyEnabled(NetworkTypePattern::WiFi()));
+
+ dictionary->SetBoolean(
+ kTagCellularAvailable,
+ handler->IsTechnologyAvailable(NetworkTypePattern::Mobile()));
+ dictionary->SetBoolean(
+ kTagCellularEnabled,
+ handler->IsTechnologyEnabled(NetworkTypePattern::Mobile()));
const DeviceState* cellular =
- handler->GetDeviceStateByType(NetworkStateHandler::kMatchTypeMobile);
+ handler->GetDeviceStateByType(NetworkTypePattern::Mobile());
dictionary->SetBoolean(
kTagCellularSupportsScan,
cellular && cellular->support_network_scan());
- dictionary->SetBoolean(kTagWimaxAvailable,
- handler->IsTechnologyAvailable(flimflam::kTypeWimax));
- dictionary->SetBoolean(kTagWimaxEnabled,
- handler->IsTechnologyEnabled(flimflam::kTypeWimax));
+ dictionary->SetBoolean(
+ kTagWimaxAvailable,
+ handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
+ dictionary->SetBoolean(
+ kTagWimaxEnabled,
+ handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
}
} // namespace options
« chrome/browser/extensions/api/dial/dial_service.cc ('K') | « chrome/browser/ui/webui/help/help_utils_chromeos.cc ('k') | chromeos/chromeos.gyp » ('j') | chromeos/network/network_change_notifier_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698