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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/prerender_condition_network.h" 5 #include "chrome/browser/chromeos/prerender_condition_network.h"
6 6
7 #include "chromeos/network/network_state.h" 7 #include "chromeos/network/network_state.h"
8 #include "chromeos/network/network_state_handler.h" 8 #include "chromeos/network/network_state_handler.h"
9 #include "chromeos/network/shill_property_util.h"
9 #include "third_party/cros_system_api/dbus/service_constants.h" 10 #include "third_party/cros_system_api/dbus/service_constants.h"
10 11
11 namespace chromeos { 12 namespace chromeos {
12 13
13 PrerenderConditionNetwork::PrerenderConditionNetwork() { 14 PrerenderConditionNetwork::PrerenderConditionNetwork() {
14 } 15 }
15 16
16 PrerenderConditionNetwork::~PrerenderConditionNetwork() { 17 PrerenderConditionNetwork::~PrerenderConditionNetwork() {
17 } 18 }
18 19
19 bool PrerenderConditionNetwork::CanPrerender() const { 20 bool PrerenderConditionNetwork::CanPrerender() const {
20 const NetworkState* default_network = 21 const NetworkState* default_network =
21 NetworkHandler::Get()->network_state_handler()->DefaultNetwork(); 22 NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
22 if (!default_network) 23 return default_network &&
23 return false; 24 !default_network->Matches(NetworkTypePattern::Mobile());
24 const std::string& type = default_network->type();
25 if (type == flimflam::kTypeEthernet || type == flimflam::kTypeWifi)
26 return true;
27 return false;
28 } 25 }
29 26
30 } // namespace chromeos 27 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698