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

Unified Diff: chrome/browser/chromeos/prerender_condition_network.cc

Issue 16272002: [Chrome OS] Make PrerenderConditionNetwork use NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm obsolete comment Created 7 years, 7 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 f7519a16a4aa91a62609a1532946b7426e4861ad..0948c35f91c97fad7437b48d6b4fb76a05e49bc0 100644
--- a/chrome/browser/chromeos/prerender_condition_network.cc
+++ b/chrome/browser/chromeos/prerender_condition_network.cc
@@ -4,27 +4,27 @@
#include "chrome/browser/chromeos/prerender_condition_network.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+
namespace chromeos {
-PrerenderConditionNetwork::PrerenderConditionNetwork(
- NetworkLibrary* network_library) : network_library_(network_library) {
- DCHECK(network_library_);
+PrerenderConditionNetwork::PrerenderConditionNetwork() {
}
PrerenderConditionNetwork::~PrerenderConditionNetwork() {
}
bool PrerenderConditionNetwork::CanPrerender() const {
- const Network* active_network = network_library_->active_network();
- if (!active_network)
+ const NetworkState* default_network =
+ NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
+ if (!default_network)
return false;
- switch (active_network->type()) {
- case TYPE_ETHERNET:
- case TYPE_WIFI:
- return true;
- default:
- return false;
- }
+ const std::string& type = default_network->type();
+ if (type == flimflam::kTypeEthernet || type == flimflam::kTypeWifi)
+ return true;
+ return false;
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/prerender_condition_network.h ('k') | chrome/browser/prerender/prerender_manager_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698