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

Unified Diff: chrome/browser/chromeos/cros/network_library.cc

Issue 7753020: Revert recent changes to base::Value (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.h ('k') | chrome/browser/chromeos/cros/network_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/network_library.cc
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index fb01a4b282a4946b6c185efa41dd055444d25b01..847cd1e132dca2fb4b28f0c8e22cdb64d7ddb741 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -183,7 +183,7 @@ void NetworkDevice::ParseInfo(const DictionaryValue& info) {
}
bool NetworkDevice::UpdateStatus(const std::string& key,
- Value* value,
+ const Value& value,
PropertyIndex* index) {
if (device_parser_.get())
return device_parser_->UpdateStatus(key, value, this, index);
@@ -430,7 +430,7 @@ void Network::InitIPAddress() {
}
bool Network::UpdateStatus(const std::string& key,
- Value* value,
+ const Value& value,
PropertyIndex* index) {
if (network_parser_.get())
return network_parser_->UpdateStatus(key, value, this, index);
@@ -2981,14 +2981,13 @@ class NetworkLibraryImplCros : public NetworkLibraryImplBase {
// Calbacks.
static void NetworkStatusChangedHandler(
void* object, const char* path, const char* key, const Value* value);
- void UpdateNetworkStatus(const std::string& path,
- const std::string& key,
- Value* value);
+ void UpdateNetworkStatus(
+ const std::string& path, const std::string& key, const Value& value);
static void NetworkDevicePropertyChangedHandler(
void* object, const char* path, const char* key, const Value* value);
void UpdateNetworkDeviceStatus(
- const std::string& path, const std::string& key, Value* value);
+ const std::string& path, const std::string& key, const Value& value);
static void PinOperationCallback(void* object,
const char* path,
@@ -3175,14 +3174,11 @@ void NetworkLibraryImplCros::NetworkStatusChangedHandler(
DCHECK(networklib);
if (key == NULL || value == NULL || path == NULL || object == NULL)
return;
- networklib->UpdateNetworkStatus(std::string(path),
- std::string(key),
- const_cast<Value*>(value));
+ networklib->UpdateNetworkStatus(std::string(path), std::string(key), *value);
}
-void NetworkLibraryImplCros::UpdateNetworkStatus(const std::string& path,
- const std::string& key,
- Value* value) {
+void NetworkLibraryImplCros::UpdateNetworkStatus(
+ const std::string& path, const std::string& key, const Value& value) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
Network* network = FindNetworkByPath(path);
if (network) {
@@ -3211,12 +3207,11 @@ void NetworkLibraryImplCros::NetworkDevicePropertyChangedHandler(
return;
networklib->UpdateNetworkDeviceStatus(std::string(path),
std::string(key),
- const_cast<Value*>(value));
+ *value);
}
-void NetworkLibraryImplCros::UpdateNetworkDeviceStatus(const std::string& path,
- const std::string& key,
- Value* value) {
+void NetworkLibraryImplCros::UpdateNetworkDeviceStatus(
+ const std::string& path, const std::string& key, const Value& value) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
NetworkDevice* device = FindNetworkDeviceByPath(path);
if (device) {
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.h ('k') | chrome/browser/chromeos/cros/network_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698