content/shell/renderer/webkit_test_runner.cc - Issue 339913002: Move MockScreenOrientationController to content/shell/renderer/test_runner/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/renderer/webkit_test_runner.cc

Issue 339913002: Move MockScreenOrientationController to content/shell/renderer/test_runner/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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

« content/shell/renderer/test_runner/mock_screen_orientation_controller.cc ('K') | « content/shell/renderer/test_runner/web_test_proxy.cc ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/webkit_test_runner.cc

diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc

index b251935744037a800a3095edb9c25873da1f0851..167eda38ad19fda77455a0c1a510f51cf5d2f6bf 100644

--- a/content/shell/renderer/webkit_test_runner.cc

+++ b/content/shell/renderer/webkit_test_runner.cc

@@ -33,6 +33,7 @@

#include "content/shell/renderer/shell_render_process_observer.h"

#include "content/shell/renderer/test_runner/WebTask.h"

#include "content/shell/renderer/test_runner/WebTestInterfaces.h"

+#include "content/shell/renderer/test_runner/mock_screen_orientation_controller.h"

#include "content/shell/renderer/test_runner/web_test_proxy.h"

#include "content/shell/renderer/test_runner/web_test_runner.h"

#include "net/base/filename_util.h"

@@ -228,11 +229,15 @@ void WebKitTestRunner::setDeviceOrientationData(

void WebKitTestRunner::setScreenOrientation(

const WebScreenOrientationType& orientation) {

- SetMockScreenOrientation(render_view(), orientation);

+ MockScreenOrientationController* mock_controller =

+ proxy()->GetScreenOrientationClientMock();

+ mock_controller->UpdateDeviceOrientation(render_view(), orientation);

}

void WebKitTestRunner::resetScreenOrientation() {

- ResetMockScreenOrientation();

+ MockScreenOrientationController* mock_controller =

+ proxy()->GetScreenOrientationClientMock();

+ mock_controller->ResetData();

}

void WebKitTestRunner::didChangeBatteryStatus(