diff options
author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 01:54:00 +0000 |
---|---|---|
committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 01:54:00 +0000 |
commit | 0de764e26db70294974f67061ab2d991c739e27f (patch) | |
tree | c3d7cfa40628e20496f65ce7abd56daebc521077 /chrome/browser/chromeos/cros/network_parser.h | |
parent | 79d0b6726455b644b1a2532cea21a421ce2f9990 (diff) | |
download | chromium_src-0de764e26db70294974f67061ab2d991c739e27f.zip chromium_src-0de764e26db70294974f67061ab2d991c739e27f.tar.gz chromium_src-0de764e26db70294974f67061ab2d991c739e27f.tar.bz2 |
Revert recent changes to base::Value
Reverts:
98223: base: Add AsList() function to Value API.
98266: base: Add AsBinary() function to Value API.
There are two issues with these commits:
1. libcros uses base::Value to pass data to Chrome. It includes values.h from libchrome which contains its own copy. This is a terrible design flaw in libcros and is being addressed (http://crosbug.com/19576), however we need some time to address this before we can make these changes without breaking Chrome on ChromeOS.
2. AsList() and AsBinary() should be const. The fact that they were not const caused re-factoring that changed const Value& input arguments to Value*, which is against the spec. When we re-introduce this, these members should be made const.
BUG=chromium-os:19604
TEST=Check bots + ChromeOS autotests
Review URL: http://codereview.chromium.org/7753020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_parser.h')
-rw-r--r-- | chrome/browser/chromeos/cros/network_parser.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/cros/network_parser.h b/chrome/browser/chromeos/cros/network_parser.h index a06a792..9181551 100644 --- a/chrome/browser/chromeos/cros/network_parser.h +++ b/chrome/browser/chromeos/cros/network_parser.h @@ -83,17 +83,16 @@ class NetworkDeviceParser { virtual bool UpdateDeviceFromInfo(const DictionaryValue& info, NetworkDevice* device); virtual bool UpdateStatus(const std::string& key, - Value* value, + const Value& value, NetworkDevice* device, PropertyIndex* index); - protected: // The NetworkDeviceParser does not take ownership of the |mapper|. explicit NetworkDeviceParser(const EnumMapper<PropertyIndex>* mapper); virtual ~NetworkDeviceParser(); virtual bool ParseValue(PropertyIndex index, - Value* value, + const Value& value, NetworkDevice* device) = 0; virtual ConnectionType ParseType(const std::string& type) = 0; @@ -126,7 +125,7 @@ class NetworkParser { // property index for the given key. |index| is filled in even if // the update fails. Returns false upon failure. virtual bool UpdateStatus(const std::string& key, - Value* value, + const Value& value, Network* network, PropertyIndex* index); protected: @@ -135,7 +134,7 @@ class NetworkParser { virtual ~NetworkParser(); virtual bool ParseValue(PropertyIndex index, - Value* value, + const Value& value, Network* network) = 0; virtual ConnectionType ParseType(const std::string& type) = 0; virtual ConnectionType ParseTypeFromDictionary( |