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

Side by Side Diff: content/renderer/v8_value_converter.cc

Issue 7149008: Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2) (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix nits Created 9 years, 6 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/renderer/v8_value_converter.h" 5 #include "content/renderer/v8_value_converter.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "v8/include/v8.h" 12 #include "v8/include/v8.h"
13 13
14 V8ValueConverter::V8ValueConverter() 14 V8ValueConverter::V8ValueConverter()
15 : allow_undefined_(false), 15 : allow_undefined_(false),
16 allow_date_(false), 16 allow_date_(false),
17 allow_regexp_(false) { 17 allow_regexp_(false) {
18 } 18 }
19 19
20 v8::Handle<v8::Value> V8ValueConverter::ToV8Value( 20 v8::Handle<v8::Value> V8ValueConverter::ToV8Value(
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 } 205 }
206 206
207 Value* child = FromV8ValueImpl(child_v8); 207 Value* child = FromV8ValueImpl(child_v8);
208 CHECK(child); 208 CHECK(child);
209 209
210 result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()), 210 result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()),
211 child); 211 child);
212 } 212 }
213 return result; 213 return result;
214 } 214 }
OLDNEW
« no previous file with comments | « content/renderer/pepper_platform_video_decoder_impl.h ('k') | content/renderer/v8_value_converter_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698