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

Side by Side Diff: content/shell/renderer/webkit_test_runner.h

Issue 222973003: Conversion of content_shell target to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed rebase Created 6 years, 8 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 (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_WEBKIT_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 26 matching lines...) Expand all
37 // This is the renderer side of the webkit test runner. 37 // This is the renderer side of the webkit test runner.
38 class WebKitTestRunner : public RenderViewObserver, 38 class WebKitTestRunner : public RenderViewObserver,
39 public RenderViewObserverTracker<WebKitTestRunner>, 39 public RenderViewObserverTracker<WebKitTestRunner>,
40 public WebTestRunner::WebTestDelegate { 40 public WebTestRunner::WebTestDelegate {
41 public: 41 public:
42 explicit WebKitTestRunner(RenderView* render_view); 42 explicit WebKitTestRunner(RenderView* render_view);
43 virtual ~WebKitTestRunner(); 43 virtual ~WebKitTestRunner();
44 44
45 // RenderViewObserver implementation. 45 // RenderViewObserver implementation.
46 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 46 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
47 virtual void DidClearWindowObject(blink::WebFrame* frame, 47 virtual void DidClearWindowObject(blink::WebLocalFrame* frame,
48 int world_id) OVERRIDE; 48 int world_id) OVERRIDE;
49 virtual void Navigate(const GURL& url) OVERRIDE; 49 virtual void Navigate(const GURL& url) OVERRIDE;
50 virtual void DidCommitProvisionalLoad(blink::WebFrame* frame, 50 virtual void DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
51 bool is_new_navigation) OVERRIDE; 51 bool is_new_navigation) OVERRIDE;
52 virtual void DidFailProvisionalLoad( 52 virtual void DidFailProvisionalLoad(blink::WebLocalFrame* frame,
53 blink::WebFrame* frame, const blink::WebURLError& error) OVERRIDE; 53 const blink::WebURLError& error) OVERRIDE;
54 54
55 // WebTestDelegate implementation. 55 // WebTestDelegate implementation.
56 virtual void clearEditCommand() OVERRIDE; 56 virtual void clearEditCommand() OVERRIDE;
57 virtual void setEditCommand(const std::string& name, 57 virtual void setEditCommand(const std::string& name,
58 const std::string& value) OVERRIDE; 58 const std::string& value) OVERRIDE;
59 virtual void setGamepadData(const blink::WebGamepads& gamepads) OVERRIDE; 59 virtual void setGamepadData(const blink::WebGamepads& gamepads) OVERRIDE;
60 virtual void didConnectGamepad(int index, 60 virtual void didConnectGamepad(int index,
61 const blink::WebGamepad& gamepad) OVERRIDE; 61 const blink::WebGamepad& gamepad) OVERRIDE;
62 virtual void didDisconnectGamepad(int index, 62 virtual void didDisconnectGamepad(int index,
63 const blink::WebGamepad& gamepad) OVERRIDE; 63 const blink::WebGamepad& gamepad) OVERRIDE;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 154
155 scoped_ptr<LeakDetector> leak_detector_; 155 scoped_ptr<LeakDetector> leak_detector_;
156 bool needs_leak_detector_; 156 bool needs_leak_detector_;
157 157
158 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); 158 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
159 }; 159 };
160 160
161 } // namespace content 161 } // namespace content
162 162
163 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 163 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/WebTestProxy.cpp ('k') | content/shell/renderer/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698