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

Side by Side Diff: content/shell/shell_render_process_observer.h

Issue 11362161: Use the WebTestProxy for layout tests in content_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: version that doesn't expose RenderViewImpl in public API Created 8 years, 1 month 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_SHELL_RENDER_PROCESS_OBSERVER_H_ 5 #ifndef CONTENT_SHELL_SHELL_RENDER_PROCESS_OBSERVER_H_
6 #define CONTENT_SHELL_SHELL_RENDER_PROCESS_OBSERVER_H_ 6 #define CONTENT_SHELL_SHELL_RENDER_PROCESS_OBSERVER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 15 matching lines...) Expand all
26 class ShellRenderProcessObserver : public RenderProcessObserver { 26 class ShellRenderProcessObserver : public RenderProcessObserver {
27 public: 27 public:
28 static ShellRenderProcessObserver* GetInstance(); 28 static ShellRenderProcessObserver* GetInstance();
29 29
30 ShellRenderProcessObserver(); 30 ShellRenderProcessObserver();
31 virtual ~ShellRenderProcessObserver(); 31 virtual ~ShellRenderProcessObserver();
32 32
33 void SetMainWindow(RenderView* view, 33 void SetMainWindow(RenderView* view,
34 WebTestRunner::WebTestDelegate* delegate); 34 WebTestRunner::WebTestDelegate* delegate);
35 void BindTestRunnersToWindow(WebKit::WebFrame* frame); 35 void BindTestRunnersToWindow(WebKit::WebFrame* frame);
36 WebTestRunner::WebTestInterfaces* test_interfaces() const {
jam 2012/11/08 20:37:06 nit: getters usually are at the end, so i.e. after
37 return test_interfaces_.get();
38 }
36 39
37 // RenderProcessObserver implementation. 40 // RenderProcessObserver implementation.
38 virtual void WebKitInitialized() OVERRIDE; 41 virtual void WebKitInitialized() OVERRIDE;
39 virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; 42 virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
40 43
41 private: 44 private:
42 // Message handlers. 45 // Message handlers.
43 void OnResetAll(); 46 void OnResetAll();
44 47
45 scoped_ptr<WebTestRunner::WebTestInterfaces> test_interfaces_; 48 scoped_ptr<WebTestRunner::WebTestInterfaces> test_interfaces_;
46 WebTestRunner::WebTestDelegate* test_delegate_; 49 WebTestRunner::WebTestDelegate* test_delegate_;
47 50
48 DISALLOW_COPY_AND_ASSIGN(ShellRenderProcessObserver); 51 DISALLOW_COPY_AND_ASSIGN(ShellRenderProcessObserver);
49 }; 52 };
50 53
51 } // namespace content 54 } // namespace content
52 55
53 #endif // CONTENT_SHELL_SHELL_RENDER_PROCESS_OBSERVER_H_ 56 #endif // CONTENT_SHELL_SHELL_RENDER_PROCESS_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698