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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
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_WEB_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 struct WebFileChooserParams; 68 struct WebFileChooserParams;
69 struct WebPluginParams; 69 struct WebPluginParams;
70 struct WebPoint; 70 struct WebPoint;
71 struct WebSize; 71 struct WebSize;
72 struct WebWindowFeatures; 72 struct WebWindowFeatures;
73 typedef unsigned WebColor; 73 typedef unsigned WebColor;
74 } 74 }
75 75
76 namespace content { 76 namespace content {
77 77
78 class MockScreenOrientationController;
78 class MockWebPushClient; 79 class MockWebPushClient;
79 class MockWebSpeechRecognizer; 80 class MockWebSpeechRecognizer;
80 class MockWebUserMediaClient; 81 class MockWebUserMediaClient;
81 class RenderFrame; 82 class RenderFrame;
82 class SpellCheckClient; 83 class SpellCheckClient;
83 class TestInterfaces; 84 class TestInterfaces;
84 class WebTestDelegate; 85 class WebTestDelegate;
85 class WebTestInterfaces; 86 class WebTestInterfaces;
86 87
87 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that 88 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that
(...skipping 30 matching lines...) Expand all
118 const base::Callback<void(const SkBitmap&)>& callback); 119 const base::Callback<void(const SkBitmap&)>& callback);
119 120
120 void SetLogConsoleOutput(bool enabled); 121 void SetLogConsoleOutput(bool enabled);
121 122
122 void DidOpenChooser(); 123 void DidOpenChooser();
123 void DidCloseChooser(); 124 void DidCloseChooser();
124 bool IsChooserShown(); 125 bool IsChooserShown();
125 126
126 void DisplayAsyncThen(const base::Closure& callback); 127 void DisplayAsyncThen(const base::Closure& callback);
127 128
129 MockScreenOrientationController* GetScreenOrientationClientMock();
128 blink::WebMIDIClientMock* GetMIDIClientMock(); 130 blink::WebMIDIClientMock* GetMIDIClientMock();
129 MockWebSpeechRecognizer* GetSpeechRecognizerMock(); 131 MockWebSpeechRecognizer* GetSpeechRecognizerMock();
130 132
131 WebTaskList* mutable_task_list() { return &task_list_; } 133 WebTaskList* mutable_task_list() { return &task_list_; }
132 134
133 blink::WebView* GetWebView() const; 135 blink::WebView* GetWebView() const;
134 136
135 void PostSpellCheckEvent(const blink::WebString& event_name); 137 void PostSpellCheckEvent(const blink::WebString& event_name);
136 138
137 // WebCompositeAndReadbackAsyncCallback implementation. 139 // WebCompositeAndReadbackAsyncCallback implementation.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 std::map<unsigned, std::string> resource_identifier_map_; 264 std::map<unsigned, std::string> resource_identifier_map_;
263 std::deque<base::Callback<void(const SkBitmap&)> > 265 std::deque<base::Callback<void(const SkBitmap&)> >
264 composite_and_readback_callbacks_; 266 composite_and_readback_callbacks_;
265 267
266 bool log_console_output_; 268 bool log_console_output_;
267 int chooser_count_; 269 int chooser_count_;
268 270
269 scoped_ptr<blink::WebMIDIClientMock> midi_client_; 271 scoped_ptr<blink::WebMIDIClientMock> midi_client_;
270 scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_; 272 scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_;
271 scoped_ptr<MockWebPushClient> push_client_; 273 scoped_ptr<MockWebPushClient> push_client_;
274 scoped_ptr<MockScreenOrientationController> screen_orientation_client_;
272 275
273 std::string accept_languages_; 276 std::string accept_languages_;
274 277
275 private: 278 private:
276 DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase); 279 DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase);
277 }; 280 };
278 281
279 // WebTestProxy is used during LayoutTests and always instantiated, at time of 282 // WebTestProxy is used during LayoutTests and always instantiated, at time of
280 // writing with Base=RenderViewImpl. It does not directly inherit from it for 283 // writing with Base=RenderViewImpl. It does not directly inherit from it for
281 // layering purposes. 284 // layering purposes.
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 return WebTestProxyBase::GetWebPushClient(); 389 return WebTestProxyBase::GetWebPushClient();
387 } 390 }
388 391
389 private: 392 private:
390 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 393 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
391 }; 394 };
392 395
393 } // namespace content 396 } // namespace content
394 397
395 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 398 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698