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

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 23712002: Cleanup network type matching. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index e4ebe740322e003c0900ea4a2956e32f5f342c5b..8007bffcd4f298831bbb99de58bb33a2bbc6306d 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -385,9 +385,10 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) {
// Ethernet
// Only display an ethernet icon if enabled, and an ethernet network exists.
- bool ethernet_enabled = handler->IsTechnologyEnabled(flimflam::kTypeEthernet);
+ bool ethernet_enabled =
+ handler->IsTechnologyEnabled(NetworkStateHandler::kMatchTypeWired);
const NetworkState* ethernet_network =
- handler->FirstNetworkByType(flimflam::kTypeEthernet);
+ handler->FirstNetworkByType(NetworkStateHandler::kMatchTypeWired);
if (ethernet_enabled && ethernet_network) {
bool ethernet_connecting = ethernet_network->IsConnectingState();
if (ethernet_connecting) {
@@ -618,8 +619,8 @@ void MoreMenuModel::InitMenuItems(bool should_open_button_options) {
}
}
- std::string ethernet_address =
- handler->FormattedHardwareAddressForType(flimflam::kTypeEthernet);
+ std::string ethernet_address = handler->FormattedHardwareAddressForType(
+ NetworkStateHandler::kMatchTypeWired);
if (!ethernet_address.empty()) {
std::string label = l10n_util::GetStringUTF8(
IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET) + " " + ethernet_address;

Powered by Google App Engine
This is Rietveld 408576698