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

Side by Side Diff: chromeos/network/favorite_state.cc

Issue 23551004: Move Shill property utility functions to a new separate file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chrome/ compilation. 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chromeos/network/favorite_state.h" 5 #include "chromeos/network/favorite_state.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chromeos/network/network_event_log.h" 10 #include "chromeos/network/network_event_log.h"
11 #include "chromeos/network/network_profile_handler.h" 11 #include "chromeos/network/network_profile_handler.h"
12 #include "chromeos/network/network_state.h" 12 #include "chromeos/network/network_state.h"
13 #include "chromeos/network/shill_property_util.h"
13 #include "third_party/cros_system_api/dbus/service_constants.h" 14 #include "third_party/cros_system_api/dbus/service_constants.h"
14 15
15 namespace chromeos { 16 namespace chromeos {
16 17
17 FavoriteState::FavoriteState(const std::string& path) 18 FavoriteState::FavoriteState(const std::string& path)
18 : ManagedState(MANAGED_TYPE_FAVORITE, path) { 19 : ManagedState(MANAGED_TYPE_FAVORITE, path) {
19 } 20 }
20 21
21 FavoriteState::~FavoriteState() { 22 FavoriteState::~FavoriteState() {
22 } 23 }
23 24
24 bool FavoriteState::PropertyChanged(const std::string& key, 25 bool FavoriteState::PropertyChanged(const std::string& key,
25 const base::Value& value) { 26 const base::Value& value) {
26 if (ManagedStatePropertyChanged(key, value)) 27 if (ManagedStatePropertyChanged(key, value))
27 return true; 28 return true;
28 if (key == flimflam::kProfileProperty) { 29 if (key == flimflam::kProfileProperty) {
29 return GetStringValue(key, value, &profile_path_); 30 return GetStringValue(key, value, &profile_path_);
30 } else if (key == flimflam::kUIDataProperty) { 31 } else if (key == flimflam::kUIDataProperty) {
31 if (!NetworkState::GetUIDataFromValue(value, &ui_data_)) { 32 if (!shill_property_util::GetUIDataFromValue(value, &ui_data_)) {
32 NET_LOG_ERROR("Failed to parse " + key, path()); 33 NET_LOG_ERROR("Failed to parse " + key, path());
33 return false; 34 return false;
34 } 35 }
35 return true; 36 return true;
36 } 37 }
37 return false; 38 return false;
38 } 39 }
39 40
40 bool FavoriteState::IsManaged() const { 41 bool FavoriteState::IsManaged() const {
41 return ui_data_.onc_source() == onc::ONC_SOURCE_DEVICE_POLICY || 42 return ui_data_.onc_source() == onc::ONC_SOURCE_DEVICE_POLICY ||
42 ui_data_.onc_source() == onc::ONC_SOURCE_USER_POLICY; 43 ui_data_.onc_source() == onc::ONC_SOURCE_USER_POLICY;
43 } 44 }
44 45
45 bool FavoriteState::IsPrivate() const { 46 bool FavoriteState::IsPrivate() const {
46 return !profile_path_.empty() && 47 return !profile_path_.empty() &&
47 profile_path_ != NetworkProfileHandler::kSharedProfilePath; 48 profile_path_ != NetworkProfileHandler::kSharedProfilePath;
48 } 49 }
49 50
50 } // namespace chromeos 51 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698