summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 18:20:05 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 18:20:05 +0000
commitb59ea313fd719a12140376a8f99409cdcd44d39d (patch)
tree05610dd307c12b258a31cbaf33611d876173180e
parent120a314db5e17428f5d8e9bc511b957c0cbdf0f7 (diff)
downloadchromium_src-b59ea313fd719a12140376a8f99409cdcd44d39d.zip
chromium_src-b59ea313fd719a12140376a8f99409cdcd44d39d.tar.gz
chromium_src-b59ea313fd719a12140376a8f99409cdcd44d39d.tar.bz2
base: Remove using declaration of BinaryValue as it's no longer necessary.
BUG=None TEST=None R=evan@chromium.org Review URL: http://codereview.chromium.org/7550026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95638 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/values.h8
-rw-r--r--chrome/browser/extensions/extension_app_api.cc2
-rw-r--r--chrome/browser/extensions/extension_browser_actions_api.cc2
-rw-r--r--chrome/browser/extensions/extension_page_actions_module.cc2
-rw-r--r--chrome/browser/extensions/extension_sidebar_api.cc4
-rw-r--r--chrome/browser/policy/user_policy_cache.cc3
-rw-r--r--chrome/renderer/extensions/extension_process_bindings.cc2
-rw-r--r--ipc/ipc_message_utils.cc5
8 files changed, 14 insertions, 14 deletions
diff --git a/base/values.h b/base/values.h
index 479beef..ebb909b 100644
--- a/base/values.h
+++ b/base/values.h
@@ -30,7 +30,6 @@
#include "base/base_export.h"
#include "base/basictypes.h"
#include "base/string16.h"
-#include "build/build_config.h"
// This file declares "using base::Value", etc. at the bottom, so that
// current code can use these classes without the base namespace. In
@@ -49,9 +48,9 @@ class Value;
typedef std::vector<Value*> ValueVector;
typedef std::map<std::string, Value*> ValueMap;
-// The Value class is the base class for Values. A Value can be
-// instantiated via the Create*Value() factory methods, or by directly
-// creating instances of the subclasses.
+// The Value class is the base class for Values. A Value can be instantiated
+// via the Create*Value() factory methods, or by directly creating instances of
+// the subclasses.
class BASE_EXPORT Value {
public:
enum ValueType {
@@ -465,7 +464,6 @@ class BASE_EXPORT ValueSerializer {
} // namespace base
// http://crbug.com/88666
-using base::BinaryValue;
using base::DictionaryValue;
using base::FundamentalValue;
using base::ListValue;
diff --git a/chrome/browser/extensions/extension_app_api.cc b/chrome/browser/extensions/extension_app_api.cc
index 91899e9..cc545fa 100644
--- a/chrome/browser/extensions/extension_app_api.cc
+++ b/chrome/browser/extensions/extension_app_api.cc
@@ -123,7 +123,7 @@ bool AppNotifyFunction::RunImpl() {
}
if (details->HasKey(kIconDataKey)) {
- BinaryValue* binary = NULL;
+ base::BinaryValue* binary = NULL;
EXTENSION_FUNCTION_VALIDATE(details->GetBinary(kIconDataKey, &binary));
IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
void* iter = NULL;
diff --git a/chrome/browser/extensions/extension_browser_actions_api.cc b/chrome/browser/extensions/extension_browser_actions_api.cc
index 750d121..562c479 100644
--- a/chrome/browser/extensions/extension_browser_actions_api.cc
+++ b/chrome/browser/extensions/extension_browser_actions_api.cc
@@ -46,7 +46,7 @@ bool BrowserActionFunction::RunImpl() {
}
bool BrowserActionSetIconFunction::RunBrowserAction() {
- BinaryValue* binary = NULL;
+ base::BinaryValue* binary = NULL;
EXTENSION_FUNCTION_VALIDATE(details_->GetBinary("imageData", &binary));
IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
void* iter = NULL;
diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc
index 4d245b4..bdd9c68 100644
--- a/chrome/browser/extensions/extension_page_actions_module.cc
+++ b/chrome/browser/extensions/extension_page_actions_module.cc
@@ -155,7 +155,7 @@ bool PageActionSetIconFunction::RunImpl() {
// setIcon can take a variant argument: either a canvas ImageData, or an
// icon index.
- BinaryValue* binary;
+ base::BinaryValue* binary;
int icon_index;
if (args->GetBinary("imageData", &binary)) {
IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
diff --git a/chrome/browser/extensions/extension_sidebar_api.cc b/chrome/browser/extensions/extension_sidebar_api.cc
index d4fca76..e9a209d 100644
--- a/chrome/browser/extensions/extension_sidebar_api.cc
+++ b/chrome/browser/extensions/extension_sidebar_api.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -229,7 +229,7 @@ bool SetBadgeTextSidebarFunction::RunImpl(TabContents* tab,
bool SetIconSidebarFunction::RunImpl(TabContents* tab,
const std::string& content_id,
const DictionaryValue& details) {
- BinaryValue* binary;
+ base::BinaryValue* binary;
EXTENSION_FUNCTION_VALIDATE(details.GetBinary(kImageDataKey, &binary));
IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
void* iter = NULL;
diff --git a/chrome/browser/policy/user_policy_cache.cc b/chrome/browser/policy/user_policy_cache.cc
index 838757b..e0e0504 100644
--- a/chrome/browser/policy/user_policy_cache.cc
+++ b/chrome/browser/policy/user_policy_cache.cc
@@ -201,7 +201,8 @@ Value* UserPolicyCache::DecodeValue(const em::GenericValue& value) const {
case em::GenericValue::VALUE_TYPE_BYTES:
if (value.has_bytes_value()) {
std::string bytes = value.bytes_value();
- return BinaryValue::CreateWithCopiedBuffer(bytes.c_str(), bytes.size());
+ return base::BinaryValue::CreateWithCopiedBuffer(bytes.c_str(),
+ bytes.size());
}
return NULL;
case em::GenericValue::VALUE_TYPE_BOOL_ARRAY: {
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index b518c9b..7aa059b 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -515,7 +515,7 @@ class ExtensionImpl : public ExtensionBase {
// Construct the Value object.
IPC::Message bitmap_pickle;
IPC::WriteParam(&bitmap_pickle, bitmap);
- *bitmap_value = BinaryValue::CreateWithCopiedBuffer(
+ *bitmap_value = base::BinaryValue::CreateWithCopiedBuffer(
static_cast<const char*>(bitmap_pickle.data()), bitmap_pickle.size());
return true;
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 9492a11..29ca11e 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -62,7 +62,8 @@ static void WriteValue(Message* m, const Value* value, int recursion) {
break;
}
case Value::TYPE_BINARY: {
- const BinaryValue* binary = static_cast<const BinaryValue*>(value);
+ const base::BinaryValue* binary =
+ static_cast<const base::BinaryValue*>(value);
m->WriteData(binary->GetBuffer(), static_cast<int>(binary->GetSize()));
break;
}
@@ -185,7 +186,7 @@ static bool ReadValue(const Message* m, void** iter, Value** value,
int length;
if (!m->ReadData(iter, &data, &length))
return false;
- *value = BinaryValue::CreateWithCopiedBuffer(data, length);
+ *value = base::BinaryValue::CreateWithCopiedBuffer(data, length);
break;
}
case Value::TYPE_DICTIONARY: {