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

Unified Diff: content/shell/renderer/test_runner/web_test_proxy.h

Issue 339913002: Move MockScreenOrientationController to content/shell/renderer/test_runner/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix layer violation 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
Index: content/shell/renderer/test_runner/web_test_proxy.h
diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/content/shell/renderer/test_runner/web_test_proxy.h
index 9facecf6d984b8ded3b4eee14c8ff67332bdba2b..f4c7f7062f692a2fe9149decff2cc19b76f2658c 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.h
+++ b/content/shell/renderer/test_runner/web_test_proxy.h
@@ -15,6 +15,7 @@
#include "content/shell/renderer/test_runner/WebTask.h"
#include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
#include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/WebKit/public/platform/WebScreenInfo.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/web/WebAXEnums.h"
@@ -75,6 +76,7 @@ typedef unsigned WebColor;
namespace content {
+class MockScreenOrientationClient;
class MockWebPushClient;
class MockWebSpeechRecognizer;
class MockWebUserMediaClient;
@@ -125,6 +127,8 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
void DisplayAsyncThen(const base::Closure& callback);
+ void GetScreenOrientationForTesting(blink::WebScreenInfo&);
+ MockScreenOrientationClient* GetScreenOrientationClientMock();
blink::WebMIDIClientMock* GetMIDIClientMock();
MockWebSpeechRecognizer* GetSpeechRecognizerMock();
@@ -269,6 +273,7 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
scoped_ptr<blink::WebMIDIClientMock> midi_client_;
scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_;
scoped_ptr<MockWebPushClient> push_client_;
+ scoped_ptr<MockScreenOrientationClient> screen_orientation_client_;
std::string accept_languages_;
@@ -299,6 +304,13 @@ class WebTestProxy : public Base, public WebTestProxyBase {
virtual ~WebTestProxy() {}
+ // WebWidgetClient implementation.
+ virtual blink::WebScreenInfo screenInfo() {
+ blink::WebScreenInfo info = Base::screenInfo();
+ WebTestProxyBase::GetScreenOrientationForTesting(info);
+ return info;
+ }
+
// WebViewClient implementation.
virtual void scheduleAnimation() { WebTestProxyBase::ScheduleAnimation(); }
virtual void postAccessibilityEvent(const blink::WebAXObject& object,
« no previous file with comments | « content/shell/renderer/test_runner/web_frame_test_proxy.h ('k') | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698