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

Side by Side Diff: content/shell/renderer/test_runner/mock_screen_orientation_client.h

Issue 596623002: Fix orientation change callbacks to go through WebLocalFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove DCHECKs Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_SCREEN_ORIENTATION_CLIENT_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_SCREEN_ORIENTATION_CLIENT_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_SCREEN_ORIENTATION_CLIENT_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_SCREEN_ORIENTATION_CLIENT_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "third_party/WebKit/public/platform/WebLockOrientationCallback.h" 9 #include "third_party/WebKit/public/platform/WebLockOrientationCallback.h"
10 #include "third_party/WebKit/public/platform/WebScreenOrientationClient.h" 10 #include "third_party/WebKit/public/platform/WebScreenOrientationClient.h"
11 #include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h" 11 #include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
12 #include "third_party/WebKit/public/platform/WebScreenOrientationType.h" 12 #include "third_party/WebKit/public/platform/WebScreenOrientationType.h"
13 13
14 namespace blink { 14 namespace blink {
15 class WebFrame; 15 class WebLocalFrame;
16 } 16 }
17 17
18 namespace content { 18 namespace content {
19 19
20 class MockScreenOrientationClient : public blink::WebScreenOrientationClient { 20 class MockScreenOrientationClient : public blink::WebScreenOrientationClient {
21 public: 21 public:
22 explicit MockScreenOrientationClient(); 22 explicit MockScreenOrientationClient();
23 virtual ~MockScreenOrientationClient(); 23 virtual ~MockScreenOrientationClient();
24 24
25 void ResetData(); 25 void ResetData();
26 void UpdateDeviceOrientation(blink::WebFrame*, 26 void UpdateDeviceOrientation(blink::WebLocalFrame* main_frame,
27 blink::WebScreenOrientationType); 27 blink::WebScreenOrientationType orientation);
28 28
29 blink::WebScreenOrientationType CurrentOrientationType() const; 29 blink::WebScreenOrientationType CurrentOrientationType() const;
30 unsigned CurrentOrientationAngle() const; 30 unsigned CurrentOrientationAngle() const;
31 31
32 private: 32 private:
33 // From blink::WebScreenOrientationClient. 33 // From blink::WebScreenOrientationClient.
34 virtual void lockOrientation(blink::WebScreenOrientationLockType, 34 virtual void lockOrientation(blink::WebScreenOrientationLockType orientation,
35 blink::WebLockOrientationCallback*); 35 blink::WebLockOrientationCallback* callback);
36 virtual void unlockOrientation(); 36 virtual void unlockOrientation();
37 37
38 void UpdateLockSync(blink::WebScreenOrientationLockType, 38 void UpdateLockSync(blink::WebScreenOrientationLockType,
39 blink::WebLockOrientationCallback*); 39 blink::WebLockOrientationCallback*);
40 void ResetLockSync(); 40 void ResetLockSync();
41 41
42 void UpdateScreenOrientation(blink::WebScreenOrientationType); 42 void UpdateScreenOrientation(blink::WebScreenOrientationType);
43 bool IsOrientationAllowedByCurrentLock(blink::WebScreenOrientationType); 43 bool IsOrientationAllowedByCurrentLock(blink::WebScreenOrientationType);
44 blink::WebScreenOrientationType SuitableOrientationForCurrentLock(); 44 blink::WebScreenOrientationType SuitableOrientationForCurrentLock();
45 static unsigned OrientationTypeToAngle(blink::WebScreenOrientationType); 45 static unsigned OrientationTypeToAngle(blink::WebScreenOrientationType);
46 46
47 blink::WebFrame* main_frame_; 47 blink::WebLocalFrame* main_frame_;
48 blink::WebScreenOrientationLockType current_lock_; 48 blink::WebScreenOrientationLockType current_lock_;
49 blink::WebScreenOrientationType device_orientation_; 49 blink::WebScreenOrientationType device_orientation_;
50 blink::WebScreenOrientationType current_orientation_; 50 blink::WebScreenOrientationType current_orientation_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(MockScreenOrientationClient); 52 DISALLOW_COPY_AND_ASSIGN(MockScreenOrientationClient);
53 }; 53 };
54 54
55 } // namespace content 55 } // namespace content
56 56
57 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_SCREEN_ORIENTATION_CONTROLLER _H_ 57 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_SCREEN_ORIENTATION_CONTROLLER _H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/shell/renderer/test_runner/mock_screen_orientation_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698