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

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

Issue 259773007: test_runner: Move WebPermissions into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 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 CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 12 matching lines...) Expand all
23 class WebView; 23 class WebView;
24 } 24 }
25 25
26 namespace gin { 26 namespace gin {
27 class ArrayBufferView; 27 class ArrayBufferView;
28 class Arguments; 28 class Arguments;
29 } 29 }
30 30
31 namespace WebTestRunner { 31 namespace WebTestRunner {
32 class TestInterfaces; 32 class TestInterfaces;
33 class WebPermissions;
34 class WebTestDelegate; 33 class WebTestDelegate;
35 } 34 }
36 35
37 namespace content { 36 namespace content {
38 37
39 class InvokeCallbackTask; 38 class InvokeCallbackTask;
40 class NotificationPresenter; 39 class NotificationPresenter;
41 class TestPageOverlay; 40 class TestPageOverlay;
41 class WebPermissions;
42 class WebTestProxyBase; 42 class WebTestProxyBase;
43 43
44 class TestRunner : public ::WebTestRunner::WebTestRunner, 44 class TestRunner : public ::WebTestRunner::WebTestRunner,
45 public base::SupportsWeakPtr<TestRunner> { 45 public base::SupportsWeakPtr<TestRunner> {
46 public: 46 public:
47 explicit TestRunner(::WebTestRunner::TestInterfaces*); 47 explicit TestRunner(::WebTestRunner::TestInterfaces*);
48 virtual ~TestRunner(); 48 virtual ~TestRunner();
49 49
50 void Install(blink::WebFrame* frame); 50 void Install(blink::WebFrame* frame);
51 51
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 ::WebTestRunner::TestInterfaces* test_interfaces_; 682 ::WebTestRunner::TestInterfaces* test_interfaces_;
683 ::WebTestRunner::WebTestDelegate* delegate_; 683 ::WebTestRunner::WebTestDelegate* delegate_;
684 blink::WebView* web_view_; 684 blink::WebView* web_view_;
685 TestPageOverlay* page_overlay_; 685 TestPageOverlay* page_overlay_;
686 WebTestProxyBase* proxy_; 686 WebTestProxyBase* proxy_;
687 687
688 // This is non-0 IFF a load is in progress. 688 // This is non-0 IFF a load is in progress.
689 blink::WebFrame* top_loading_frame_; 689 blink::WebFrame* top_loading_frame_;
690 690
691 // WebPermissionClient mock object. 691 // WebPermissionClient mock object.
692 scoped_ptr< ::WebTestRunner::WebPermissions> web_permissions_; 692 scoped_ptr<WebPermissions> web_permissions_;
693 693
694 scoped_ptr<content::NotificationPresenter> notification_presenter_; 694 scoped_ptr<NotificationPresenter> notification_presenter_;
695 695
696 bool pointer_locked_; 696 bool pointer_locked_;
697 enum { 697 enum {
698 PointerLockWillSucceed, 698 PointerLockWillSucceed,
699 PointerLockWillRespondAsync, 699 PointerLockWillRespondAsync,
700 PointerLockWillFailSync, 700 PointerLockWillFailSync,
701 } pointer_lock_planned_result_; 701 } pointer_lock_planned_result_;
702 bool use_mock_theme_; 702 bool use_mock_theme_;
703 703
704 base::WeakPtrFactory<TestRunner> weak_factory_; 704 base::WeakPtrFactory<TestRunner> weak_factory_;
705 705
706 DISALLOW_COPY_AND_ASSIGN(TestRunner); 706 DISALLOW_COPY_AND_ASSIGN(TestRunner);
707 }; 707 };
708 708
709 } // namespace content 709 } // namespace content
710 710
711 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 711 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698