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

Unified Diff: content/shell/test_runner/gamepad_controller.cc

Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame. (Closed)
Patch Set: Rebasing... Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/test_runner/gamepad_controller.h ('k') | content/shell/test_runner/gc_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/test_runner/gamepad_controller.cc
diff --git a/content/shell/test_runner/gamepad_controller.cc b/content/shell/test_runner/gamepad_controller.cc
index f58bfa46145bf23069873ff59fb81d4039076bc2..b92eae03488f52b5a5bd500140fa590e2f297b3c 100644
--- a/content/shell/test_runner/gamepad_controller.cc
+++ b/content/shell/test_runner/gamepad_controller.cc
@@ -13,11 +13,10 @@
#include "gin/object_template_builder.h"
#include "gin/wrappable.h"
#include "third_party/WebKit/public/platform/WebGamepadListener.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "v8/include/v8.h"
-using blink::WebFrame;
using device::Gamepad;
using device::Gamepads;
@@ -29,7 +28,7 @@ class GamepadControllerBindings
static gin::WrapperInfo kWrapperInfo;
static void Install(base::WeakPtr<GamepadController> controller,
- blink::WebFrame* frame);
+ blink::WebLocalFrame* frame);
private:
explicit GamepadControllerBindings(
@@ -60,7 +59,7 @@ gin::WrapperInfo GamepadControllerBindings::kWrapperInfo = {
// static
void GamepadControllerBindings::Install(
base::WeakPtr<GamepadController> controller,
- WebFrame* frame) {
+ blink::WebLocalFrame* frame) {
v8::Isolate* isolate = blink::MainThreadIsolate();
v8::HandleScope handle_scope(isolate);
v8::Local<v8::Context> context = frame->MainWorldScriptContext();
@@ -161,7 +160,7 @@ void GamepadController::Reset() {
memset(&gamepads_, 0, sizeof(gamepads_));
}
-void GamepadController::Install(WebFrame* frame) {
+void GamepadController::Install(blink::WebLocalFrame* frame) {
GamepadControllerBindings::Install(weak_factory_.GetWeakPtr(), frame);
}
« no previous file with comments | « content/shell/test_runner/gamepad_controller.h ('k') | content/shell/test_runner/gc_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698