Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 class WebURL; | 23 class WebURL; |
| 24 class WebView; | 24 class WebView; |
| 25 } | 25 } |
| 26 | 26 |
| 27 namespace WebTestRunner { | 27 namespace WebTestRunner { |
| 28 | 28 |
| 29 class AccessibilityController; | 29 class AccessibilityController; |
| 30 class EventSender; | 30 class EventSender; |
| 31 class GamepadController; | 31 class GamepadController; |
| 32 class TestRunner; | 32 class TestRunner; |
| 33 class TextInputController; | |
| 34 class WebTestDelegate; | 33 class WebTestDelegate; |
| 35 class WebTestProxyBase; | 34 class WebTestProxyBase; |
| 36 | 35 |
| 37 class TestInterfaces { | 36 class TestInterfaces { |
| 38 public: | 37 public: |
| 39 TestInterfaces(); | 38 TestInterfaces(); |
| 40 ~TestInterfaces(); | 39 ~TestInterfaces(); |
| 41 | 40 |
| 42 void setWebView(blink::WebView*, WebTestProxyBase*); | 41 void setWebView(blink::WebView*, WebTestProxyBase*); |
| 43 void setDelegate(WebTestDelegate*); | 42 void setDelegate(WebTestDelegate*); |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 55 TestRunner* testRunner(); | 54 TestRunner* testRunner(); |
| 56 WebTestDelegate* delegate(); | 55 WebTestDelegate* delegate(); |
| 57 WebTestProxyBase* proxy(); | 56 WebTestProxyBase* proxy(); |
| 58 const std::vector<WebTestProxyBase*>& windowList(); | 57 const std::vector<WebTestProxyBase*>& windowList(); |
| 59 blink::WebThemeEngine* themeEngine(); | 58 blink::WebThemeEngine* themeEngine(); |
| 60 | 59 |
| 61 private: | 60 private: |
| 62 scoped_ptr<AccessibilityController> m_accessibilityController; | 61 scoped_ptr<AccessibilityController> m_accessibilityController; |
| 63 scoped_ptr<EventSender> m_eventSender; | 62 scoped_ptr<EventSender> m_eventSender; |
| 64 scoped_ptr<GamepadController> m_gamepadController; | 63 scoped_ptr<GamepadController> m_gamepadController; |
| 65 scoped_ptr<TextInputController> m_textInputController; | |
|
jochen (gone - plz use gerrit)
2014/02/10 12:32:05
i've updated my gamepad controller to use a less i
| |
| 66 scoped_ptr<TestRunner> m_testRunner; | 64 scoped_ptr<TestRunner> m_testRunner; |
| 67 WebTestDelegate* m_delegate; | 65 WebTestDelegate* m_delegate; |
| 68 WebTestProxyBase* m_proxy; | 66 WebTestProxyBase* m_proxy; |
| 69 | 67 |
| 70 std::vector<WebTestProxyBase*> m_windowList; | 68 std::vector<WebTestProxyBase*> m_windowList; |
| 71 #if defined(__APPLE__) | 69 #if defined(__APPLE__) |
| 72 scoped_ptr<WebTestThemeEngineMac> m_themeEngine; | 70 scoped_ptr<WebTestThemeEngineMac> m_themeEngine; |
| 73 #else | 71 #else |
| 74 scoped_ptr<WebTestThemeEngineMock> m_themeEngine; | 72 scoped_ptr<WebTestThemeEngineMock> m_themeEngine; |
| 75 #endif | 73 #endif |
| 76 | 74 |
| 77 DISALLOW_COPY_AND_ASSIGN(TestInterfaces); | 75 DISALLOW_COPY_AND_ASSIGN(TestInterfaces); |
| 78 }; | 76 }; |
| 79 | 77 |
| 80 } | 78 } |
| 81 | 79 |
| 82 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TESTINTERFACES_H_ | 80 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TESTINTERFACES_H_ |
| OLD | NEW |