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

Side by Side Diff: content/shell/renderer/layout_test/blink_test_runner.h

Issue 1740843002: Revert of Migrates battery_status from content/renderer/ to WebKit/platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_
6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "components/test_runner/test_preferences.h" 15 #include "components/test_runner/test_preferences.h"
16 #include "components/test_runner/web_test_delegate.h" 16 #include "components/test_runner/web_test_delegate.h"
17 #include "content/public/common/page_state.h" 17 #include "content/public/common/page_state.h"
18 #include "content/public/renderer/render_view_observer.h" 18 #include "content/public/renderer/render_view_observer.h"
19 #include "content/public/renderer/render_view_observer_tracker.h" 19 #include "content/public/renderer/render_view_observer_tracker.h"
20 #include "content/shell/common/shell_test_configuration.h" 20 #include "content/shell/common/shell_test_configuration.h"
21 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationType.h" 21 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationType.h"
22 #include "v8/include/v8.h" 22 #include "v8/include/v8.h"
23 23
24 class SkBitmap; 24 class SkBitmap;
25 class SkCanvas; 25 class SkCanvas;
26 26
27 namespace blink { 27 namespace blink {
28 class WebBatteryStatus;
28 class WebDeviceMotionData; 29 class WebDeviceMotionData;
29 class WebDeviceOrientationData; 30 class WebDeviceOrientationData;
30 struct WebRect; 31 struct WebRect;
31 } 32 }
32 33
33 namespace test_runner { 34 namespace test_runner {
34 class WebTestProxyBase; 35 class WebTestProxyBase;
35 } 36 }
36 37
37 namespace content { 38 namespace content {
(...skipping 25 matching lines...) Expand all
63 void SetEditCommand(const std::string& name, 64 void SetEditCommand(const std::string& name,
64 const std::string& value) override; 65 const std::string& value) override;
65 void SetGamepadProvider(test_runner::GamepadController* controller) override; 66 void SetGamepadProvider(test_runner::GamepadController* controller) override;
66 void SetDeviceLightData(const double data) override; 67 void SetDeviceLightData(const double data) override;
67 void SetDeviceMotionData(const blink::WebDeviceMotionData& data) override; 68 void SetDeviceMotionData(const blink::WebDeviceMotionData& data) override;
68 void SetDeviceOrientationData( 69 void SetDeviceOrientationData(
69 const blink::WebDeviceOrientationData& data) override; 70 const blink::WebDeviceOrientationData& data) override;
70 void SetScreenOrientation( 71 void SetScreenOrientation(
71 const blink::WebScreenOrientationType& orientation) override; 72 const blink::WebScreenOrientationType& orientation) override;
72 void ResetScreenOrientation() override; 73 void ResetScreenOrientation() override;
74 void DidChangeBatteryStatus(const blink::WebBatteryStatus& status) override;
73 void PrintMessage(const std::string& message) override; 75 void PrintMessage(const std::string& message) override;
74 void PostTask(test_runner::WebTask* task) override; 76 void PostTask(test_runner::WebTask* task) override;
75 void PostDelayedTask(test_runner::WebTask* task, long long ms) override; 77 void PostDelayedTask(test_runner::WebTask* task, long long ms) override;
76 blink::WebString RegisterIsolatedFileSystem( 78 blink::WebString RegisterIsolatedFileSystem(
77 const blink::WebVector<blink::WebString>& absolute_filenames) override; 79 const blink::WebVector<blink::WebString>& absolute_filenames) override;
78 long long GetCurrentTimeInMillisecond() override; 80 long long GetCurrentTimeInMillisecond() override;
79 blink::WebString GetAbsoluteWebStringFromUTF8Path( 81 blink::WebString GetAbsoluteWebStringFromUTF8Path(
80 const std::string& utf8_path) override; 82 const std::string& utf8_path) override;
81 blink::WebURL LocalFileToDataURL(const blink::WebURL& file_url) override; 83 blink::WebURL LocalFileToDataURL(const blink::WebURL& file_url) override;
82 blink::WebURL RewriteLayoutTestsURL(const std::string& utf8_url) override; 84 blink::WebURL RewriteLayoutTestsURL(const std::string& utf8_url) override;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 bool focus_on_next_commit_; 206 bool focus_on_next_commit_;
205 207
206 scoped_ptr<LeakDetector> leak_detector_; 208 scoped_ptr<LeakDetector> leak_detector_;
207 209
208 DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); 210 DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner);
209 }; 211 };
210 212
211 } // namespace content 213 } // namespace content
212 214
213 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ 215 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.cc ('k') | content/shell/renderer/layout_test/blink_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698