| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ | 5 #ifndef COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ |
| 6 #define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ | 6 #define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 scoped_ptr<MockWebUserMediaClient> user_media_client_; | 263 scoped_ptr<MockWebUserMediaClient> user_media_client_; |
| 264 | 264 |
| 265 bool animate_scheduled_; | 265 bool animate_scheduled_; |
| 266 std::map<unsigned, std::string> resource_identifier_map_; | 266 std::map<unsigned, std::string> resource_identifier_map_; |
| 267 | 267 |
| 268 bool log_console_output_; | 268 bool log_console_output_; |
| 269 int chooser_count_; | 269 int chooser_count_; |
| 270 | 270 |
| 271 scoped_ptr<MockCredentialManagerClient> credential_manager_client_; | 271 scoped_ptr<MockCredentialManagerClient> credential_manager_client_; |
| 272 scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_; | 272 scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_; |
| 273 scoped_ptr<MockScreenOrientationClient> screen_orientation_client_; | |
| 274 | 273 |
| 275 std::string accept_languages_; | 274 std::string accept_languages_; |
| 276 | 275 |
| 277 private: | 276 private: |
| 278 DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase); | 277 DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase); |
| 279 }; | 278 }; |
| 280 | 279 |
| 281 // WebTestProxy is used during LayoutTests and always instantiated, at time of | 280 // WebTestProxy is used during LayoutTests and always instantiated, at time of |
| 282 // writing with Base=RenderViewImpl. It does not directly inherit from it for | 281 // writing with Base=RenderViewImpl. It does not directly inherit from it for |
| 283 // layering purposes. | 282 // layering purposes. |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 | 386 |
| 388 private: | 387 private: |
| 389 virtual ~WebTestProxy() {} | 388 virtual ~WebTestProxy() {} |
| 390 | 389 |
| 391 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); | 390 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); |
| 392 }; | 391 }; |
| 393 | 392 |
| 394 } // namespace test_runner | 393 } // namespace test_runner |
| 395 | 394 |
| 396 #endif // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ | 395 #endif // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ |
| OLD | NEW |