summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-21 18:06:37 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-21 18:06:37 +0000
commit53b14ea66be2c71fffe042fe0be7dc8b7561c614 (patch)
treef97eef25f5469ddab005e2dbdf3aa2a8f6121573 /cc
parent821dfd81a72381cab8fe755f2c16d98c31701e0f (diff)
downloadchromium_src-53b14ea66be2c71fffe042fe0be7dc8b7561c614.zip
chromium_src-53b14ea66be2c71fffe042fe0be7dc8b7561c614.tar.gz
chromium_src-53b14ea66be2c71fffe042fe0be7dc8b7561c614.tar.bz2
Update uses of Value in android_webview, apps, ash, cc to use the base:: namespace.
BUG=88666 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/118293005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/output/filter_operation.cc4
-rw-r--r--cc/output/filter_operations.cc2
-rw-r--r--cc/quads/texture_draw_quad.cc2
-rw-r--r--cc/test/layer_tree_json_parser.cc8
4 files changed, 8 insertions, 8 deletions
diff --git a/cc/output/filter_operation.cc b/cc/output/filter_operation.cc
index 50f111f..181fa8a 100644
--- a/cc/output/filter_operation.cc
+++ b/cc/output/filter_operation.cc
@@ -219,7 +219,7 @@ FilterOperation FilterOperation::Blend(const FilterOperation* from,
}
scoped_ptr<base::Value> FilterOperation::AsValue() const {
- scoped_ptr<base::DictionaryValue> value(new DictionaryValue);
+ scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
value->SetInteger("type", type_);
switch (type_) {
case FilterOperation::GRAYSCALE:
@@ -240,7 +240,7 @@ scoped_ptr<base::Value> FilterOperation::AsValue() const {
value->SetInteger("color", drop_shadow_color_);
break;
case FilterOperation::COLOR_MATRIX: {
- scoped_ptr<ListValue> matrix(new ListValue);
+ scoped_ptr<base::ListValue> matrix(new base::ListValue);
for (size_t i = 0; i < arraysize(matrix_); ++i)
matrix->AppendDouble(matrix_[i]);
value->Set("matrix", matrix.release());
diff --git a/cc/output/filter_operations.cc b/cc/output/filter_operations.cc
index 21d222e..16a0040 100644
--- a/cc/output/filter_operations.cc
+++ b/cc/output/filter_operations.cc
@@ -195,7 +195,7 @@ FilterOperations FilterOperations::Blend(const FilterOperations& from,
}
scoped_ptr<base::Value> FilterOperations::AsValue() const {
- scoped_ptr<base::ListValue> value(new ListValue);
+ scoped_ptr<base::ListValue> value(new base::ListValue);
for (size_t i = 0; i < operations_.size(); ++i)
value->Append(operations_[i].AsValue().release());
return value.PassAs<base::Value>();
diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc
index 191dcc4..244f479 100644
--- a/cc/quads/texture_draw_quad.cc
+++ b/cc/quads/texture_draw_quad.cc
@@ -90,7 +90,7 @@ void TextureDrawQuad::ExtendValue(base::DictionaryValue* value) const {
value->Set("uv_top_left", MathUtil::AsValue(uv_top_left).release());
value->Set("uv_bottom_right", MathUtil::AsValue(uv_bottom_right).release());
value->SetInteger("background_color", background_color);
- scoped_ptr<ListValue> vertex_opacity_value(new ListValue);
+ scoped_ptr<base::ListValue> vertex_opacity_value(new base::ListValue);
for (size_t i = 0; i < 4; ++i)
vertex_opacity_value->AppendDouble(vertex_opacity[i]);
value->Set("vertex_opacity", vertex_opacity_value.release());
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index d120067..e7f3e9b 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -19,12 +19,12 @@ namespace {
scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
ContentLayerClient* content_client) {
- DictionaryValue* dict;
+ base::DictionaryValue* dict;
bool success = true;
success &= val->GetAsDictionary(&dict);
std::string layer_type;
success &= dict->GetString("LayerType", &layer_type);
- ListValue* list;
+ base::ListValue* list;
success &= dict->GetList("Bounds", &list);
int width, height;
success &= list->GetInteger(0, &width);
@@ -50,7 +50,7 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
success &= list->GetInteger(2, &aperture_width);
success &= list->GetInteger(3, &aperture_height);
- ListValue* bounds;
+ base::ListValue* bounds;
success &= dict->GetList("ImageBounds", &bounds);
double image_width, image_height;
success &= bounds->GetDouble(0, &image_width);
@@ -132,7 +132,7 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
new_layer->SetTransform(layer_transform);
success &= dict->GetList("Children", &list);
- for (ListValue::const_iterator it = list->begin();
+ for (base::ListValue::const_iterator it = list->begin();
it != list->end(); ++it) {
new_layer->AddChild(ParseTreeFromValue(*it, content_client));
}