Index: content/renderer/render_view_impl.cc |
=================================================================== |
--- content/renderer/render_view_impl.cc (revision 181443) |
+++ content/renderer/render_view_impl.cc (working copy) |
@@ -2581,7 +2581,7 @@ |
} |
void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { |
-#if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003 |
+#if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003 |
#if !defined(OS_WIN) // http://crbug.com/160122 |
CompositorThread* compositor_thread = |
RenderThreadImpl::current()->compositor_thread(); |
@@ -4055,7 +4055,7 @@ |
} |
void RenderViewImpl::CreateFrameTree(WebKit::WebFrame* frame, |
- DictionaryValue* frame_tree) { |
+ base::DictionaryValue* frame_tree) { |
// TODO(nasko): Remove once http://crbug.com/153701 is fixed. |
DCHECK(false); |
NavigateToSwappedOutURL(frame); |
@@ -4069,7 +4069,7 @@ |
active_frame_id_map_.insert(std::pair<int, int>(frame->identifier(), |
remote_id)); |
- ListValue* children; |
+ base::ListValue* children; |
if (!frame_tree->GetList(kFrameTreeNodeSubtreeKey, &children)) |
return; |
@@ -4586,7 +4586,7 @@ |
if (web_frame) |
result = web_frame->executeScriptAndReturnValue(WebScriptSource(jscript)); |
if (notify_result) { |
- ListValue list; |
+ base::ListValue list; |
if (!result.IsEmpty() && web_frame) { |
v8::HandleScope handle_scope; |
v8::Local<v8::Context> context = web_frame->mainWorldScriptContext(); |
@@ -4595,10 +4595,9 @@ |
converter.SetDateAllowed(true); |
converter.SetRegExpAllowed(true); |
base::Value* result_value = converter.FromV8Value(result, context); |
- list.Set(0, result_value ? result_value : |
- base::Value::CreateNullValue()); |
+ list.Set(0, result_value ? result_value : base::Value::CreateNullValue()); |
} else { |
- list.Set(0, Value::CreateNullValue()); |
+ list.Set(0, base::Value::CreateNullValue()); |
} |
Send(new ViewHostMsg_ScriptEvalResponse(routing_id_, id, list)); |
} |