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

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

Issue 393983009: test_runner: Rename WebTestThemeEngineMock to MockWebThemeEngine. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « content/content_shell.gypi ('k') | content/shell/renderer/test_runner/TestInterfaces.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TESTINTERFACES_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_TESTINTERFACES_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TESTINTERFACES_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TESTINTERFACES_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "third_party/WebKit/public/platform/WebNonCopyable.h" 12 #include "third_party/WebKit/public/platform/WebNonCopyable.h"
13 13
14 #if defined(__APPLE__) 14 #if defined(__APPLE__)
15 #include "content/shell/renderer/test_runner/WebTestThemeEngineMac.h" 15 #include "content/shell/renderer/test_runner/WebTestThemeEngineMac.h"
16 #else 16 #else
17 #include "content/shell/renderer/test_runner/WebTestThemeEngineMock.h" 17 #include "content/shell/renderer/test_runner/mock_web_theme_engine.h"
18 #endif 18 #endif
19 19
20 namespace blink { 20 namespace blink {
21 class WebFrame; 21 class WebFrame;
22 class WebThemeEngine; 22 class WebThemeEngine;
23 class WebURL; 23 class WebURL;
24 class WebView; 24 class WebView;
25 } 25 }
26 26
27 namespace content { 27 namespace content {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 scoped_ptr<GamepadController> m_gamepadController; 64 scoped_ptr<GamepadController> m_gamepadController;
65 scoped_ptr<TextInputController> m_textInputController; 65 scoped_ptr<TextInputController> m_textInputController;
66 scoped_ptr<TestRunner> m_testRunner; 66 scoped_ptr<TestRunner> m_testRunner;
67 WebTestDelegate* m_delegate; 67 WebTestDelegate* m_delegate;
68 WebTestProxyBase* m_proxy; 68 WebTestProxyBase* m_proxy;
69 69
70 std::vector<WebTestProxyBase*> m_windowList; 70 std::vector<WebTestProxyBase*> m_windowList;
71 #if defined(__APPLE__) 71 #if defined(__APPLE__)
72 scoped_ptr<WebTestThemeEngineMac> m_themeEngine; 72 scoped_ptr<WebTestThemeEngineMac> m_themeEngine;
73 #else 73 #else
74 scoped_ptr<WebTestThemeEngineMock> m_themeEngine; 74 scoped_ptr<MockWebThemeEngine> m_themeEngine;
75 #endif 75 #endif
76 76
77 DISALLOW_COPY_AND_ASSIGN(TestInterfaces); 77 DISALLOW_COPY_AND_ASSIGN(TestInterfaces);
78 }; 78 };
79 79
80 } // namespace content 80 } // namespace content
81 81
82 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TESTINTERFACES_H_ 82 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TESTINTERFACES_H_
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | content/shell/renderer/test_runner/TestInterfaces.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698