chrome/browser/ui/webui/help/help_utils_chromeos.cc - Issue 23712002: Cleanup network type matching.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fixed unit test in Debug. 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:

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);