summaryrefslogtreecommitdiffstats
path: root/chromeos/network/network_state_handler.h
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 05:24:25 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 05:24:25 +0000
commitd9b99bf3a00997278a7abf18ff160e910649fac6 (patch)
tree6b9aae126aaea006f7013d920a46297dae50f960 /chromeos/network/network_state_handler.h
parent594ad2cd145722e45dfc3db0acd004961d6afade (diff)
downloadchromium_src-d9b99bf3a00997278a7abf18ff160e910649fac6.zip
chromium_src-d9b99bf3a00997278a7abf18ff160e910649fac6.tar.gz
chromium_src-d9b99bf3a00997278a7abf18ff160e910649fac6.tar.bz2
Disable network in demo mode.
R=stevenjb@chromium.org BUG=358978 TEST=Wrote a custom demo app and tested on the device to ensure that after the patch, the app could no longer access the network. Review URL: https://codereview.chromium.org/248043004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_state_handler.h')
-rw-r--r--chromeos/network/network_state_handler.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h
index 2c4e621..72d4029 100644
--- a/chromeos/network/network_state_handler.h
+++ b/chromeos/network/network_state_handler.h
@@ -13,6 +13,7 @@
#include "base/callback_forward.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
#include "chromeos/chromeos_export.h"
#include "chromeos/network/managed_state.h"
@@ -327,9 +328,14 @@ class CHROMEOS_EXPORT NetworkStateHandler
// Called whenever Device.Scanning state transitions to false.
void ScanCompleted(const std::string& type);
- // Returns the technology type for |type|.
+ // Returns one technology type for |type|. This technology will be the
+ // highest priority technology in the type pattern.
std::string GetTechnologyForType(const NetworkTypePattern& type) const;
+ // Returns all the technology types for |type|.
+ ScopedVector<std::string> GetTechnologiesForType(
+ const NetworkTypePattern& type) const;
+
// Shill property handler instance, owned by this class.
scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;