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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/help/help_utils_chromeos.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/chromeos/sim_unlock_ui.cc ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('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/help/help_utils_chromeos.cc
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
index c8b1e4d3d6c5b65c1e6f8c7e96633a8ca9ddbc86..376fecdc59c1311c623878415bc2b751df44d34b 100644
--- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc
+++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -10,6 +10,7 @@
#include "base/values.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/cros_settings_names.h"
+#include "chromeos/network/shill_property_util.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
@@ -47,7 +48,7 @@ bool IsUpdateOverCellularAllowed() {
}
string16 GetConnectionTypeAsUTF16(const std::string& type) {
- if (type == flimflam::kTypeEthernet)
+ if (chromeos::NetworkTypePattern::Ethernet().MatchesType(type))
return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_ETHERNET);
if (type == flimflam::kTypeWifi)
return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIFI);
« chrome/browser/extensions/api/dial/dial_service.cc ('K') | « chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | chromeos/network/network_change_notifier_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698