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

Side by Side Diff: chrome/test/render_view_test.cc

Issue 115681: switch to using native JSON object (Closed)
Patch Set: all in one Created 11 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/test/render_view_test.h" 5 #include "chrome/test/render_view_test.h"
6 6
7 #include "chrome/common/native_web_keyboard_event.h" 7 #include "chrome/common/native_web_keyboard_event.h"
8 #include "chrome/common/render_messages.h" 8 #include "chrome/common/render_messages.h"
9 #include "chrome/browser/extensions/extension_function_dispatcher.h" 9 #include "chrome/browser/extensions/extension_function_dispatcher.h"
10 #include "chrome/renderer/extensions/event_bindings.h" 10 #include "chrome/renderer/extensions/event_bindings.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #elif defined(OS_POSIX) 61 #elif defined(OS_POSIX)
62 command_line_.reset(new CommandLine(std::vector<std::string>())); 62 command_line_.reset(new CommandLine(std::vector<std::string>()));
63 #endif 63 #endif
64 params_.reset(new MainFunctionParams(*command_line_, *sandbox_init_wrapper_, 64 params_.reset(new MainFunctionParams(*command_line_, *sandbox_init_wrapper_,
65 NULL)); 65 NULL));
66 platform_.reset(new RendererMainPlatformDelegate(*params_)); 66 platform_.reset(new RendererMainPlatformDelegate(*params_));
67 platform_->PlatformInitialize(); 67 platform_->PlatformInitialize();
68 68
69 WebKit::initialize(&webkitclient_); 69 WebKit::initialize(&webkitclient_);
70 WebKit::registerExtension(BaseJsV8Extension::Get()); 70 WebKit::registerExtension(BaseJsV8Extension::Get());
71 WebKit::registerExtension(JsonJsV8Extension::Get());
72 WebKit::registerExtension(JsonSchemaJsV8Extension::Get()); 71 WebKit::registerExtension(JsonSchemaJsV8Extension::Get());
73 WebKit::registerExtension(EventBindings::Get()); 72 WebKit::registerExtension(EventBindings::Get());
74 WebKit::registerExtension(ExtensionProcessBindings::Get()); 73 WebKit::registerExtension(ExtensionProcessBindings::Get());
75 WebKit::registerExtension(RendererExtensionBindings::Get()); 74 WebKit::registerExtension(RendererExtensionBindings::Get());
76 EventBindings::SetRenderThread(&render_thread_); 75 EventBindings::SetRenderThread(&render_thread_);
77 76
78 // TODO(aa): Should some of this go to some other inheriting class? 77 // TODO(aa): Should some of this go to some other inheriting class?
79 std::vector<std::string> names; 78 std::vector<std::string> names;
80 ExtensionFunctionDispatcher::GetAllFunctionNames(&names); 79 ExtensionFunctionDispatcher::GetAllFunctionNames(&names);
81 ExtensionProcessBindings::SetFunctionNames(names); 80 ExtensionProcessBindings::SetFunctionNames(names);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 keyup_message->WriteData(reinterpret_cast<const char*>(&keyup_event), 154 keyup_message->WriteData(reinterpret_cast<const char*>(&keyup_event),
156 sizeof(WebKit::WebKeyboardEvent)); 155 sizeof(WebKit::WebKeyboardEvent));
157 view_->OnHandleInputEvent(*keyup_message); 156 view_->OnHandleInputEvent(*keyup_message);
158 157
159 return length; 158 return length;
160 #else 159 #else
161 NOTIMPLEMENTED(); 160 NOTIMPLEMENTED();
162 return L'\0'; 161 return L'\0';
163 #endif 162 #endif
164 } 163 }
OLDNEW
« no previous file with comments | « chrome/renderer/resources/renderer_extension_bindings.js ('k') | webkit/glue/devtools/js/devtools.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698