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

Unified Diff: chrome/browser/chromeos/prerender_condition_network.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/prerender_condition_network.cc
diff --git a/chrome/browser/chromeos/prerender_condition_network.cc b/chrome/browser/chromeos/prerender_condition_network.cc
index 0948c35f91c97fad7437b48d6b4fb76a05e49bc0..e8ed05be8cebc7d7b0353e0eb21899103c2833ec 100644
--- a/chrome/browser/chromeos/prerender_condition_network.cc
+++ b/chrome/browser/chromeos/prerender_condition_network.cc
@@ -6,6 +6,7 @@
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/shill_property_util.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
namespace chromeos {
@@ -19,12 +20,8 @@ PrerenderConditionNetwork::~PrerenderConditionNetwork() {
bool PrerenderConditionNetwork::CanPrerender() const {
const NetworkState* default_network =
NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
- if (!default_network)
- return false;
- const std::string& type = default_network->type();
- if (type == flimflam::kTypeEthernet || type == flimflam::kTypeWifi)
- return true;
- return false;
+ return default_network &&
+ !default_network->Matches(NetworkTypePattern::Mobile());
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698