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

Unified Diff: chrome/browser/chromeos/login/proxy_settings_dialog.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/login/proxy_settings_dialog.cc
diff --git a/chrome/browser/chromeos/login/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
index f3d7415720a8122ba3f1782981e0c8c1d2e6316e..bbb503a743e3bea695c84eb1cb3c42d99def9dac 100644
--- a/chrome/browser/chromeos/login/proxy_settings_dialog.cc
+++ b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
@@ -63,14 +63,14 @@ ProxySettingsDialog::ProxySettingsDialog(const NetworkState& network,
gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
SetDialogSize(CalculateSize(screen_bounds.width(),
- kProxySettingsDialogReasonableWidth,
- kProxySettingsDialogReasonableWidthRatio),
+ kProxySettingsDialogReasonableWidth,
+ kProxySettingsDialogReasonableWidthRatio),
CalculateSize(screen_bounds.height(),
- kProxySettingsDialogReasonableHeight,
- kProxySettingsDialogReasonableHeightRatio));
+ kProxySettingsDialogReasonableHeight,
+ kProxySettingsDialogReasonableHeightRatio));
std::string network_name = network.name();
- if (network_name.empty() && network.type() == flimflam::kTypeEthernet) {
+ if (network_name.empty() && network.IsTypeEthernet()) {
network_name =
l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
}

Powered by Google App Engine
This is Rietveld 408576698