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

Side by Side Diff: webkit/tools/test_shell/test_shell.h

Issue 1549039: Enable support for notifications layout tests in test shell.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 8 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 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "webkit/tools/test_shell/webwidget_host.h" 47 #include "webkit/tools/test_shell/webwidget_host.h"
48 48
49 typedef std::list<gfx::NativeWindow> WindowList; 49 typedef std::list<gfx::NativeWindow> WindowList;
50 50
51 struct WebPreferences; 51 struct WebPreferences;
52 class AccessibilityController; 52 class AccessibilityController;
53 class FilePath; 53 class FilePath;
54 class GURL; 54 class GURL;
55 class TestNavigationEntry; 55 class TestNavigationEntry;
56 class TestNavigationController; 56 class TestNavigationController;
57 class TestNotificationPresenter;
57 class TestShellDevToolsAgent; 58 class TestShellDevToolsAgent;
58 class TestShellDevToolsClient; 59 class TestShellDevToolsClient;
59 class TestWebViewDelegate; 60 class TestWebViewDelegate;
60 61
61 namespace base { 62 namespace base {
62 class StringPiece; 63 class StringPiece;
63 } 64 }
64 65
65 class TestShell : public base::SupportsWeakPtr<TestShell> { 66 class TestShell : public base::SupportsWeakPtr<TestShell> {
66 public: 67 public:
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 return layout_test_controller_.get(); 153 return layout_test_controller_.get();
153 } 154 }
154 TestWebViewDelegate* delegate() { return delegate_.get(); } 155 TestWebViewDelegate* delegate() { return delegate_.get(); }
155 TestWebViewDelegate* popup_delegate() { return popup_delegate_.get(); } 156 TestWebViewDelegate* popup_delegate() { return popup_delegate_.get(); }
156 TestNavigationController* navigation_controller() { 157 TestNavigationController* navigation_controller() {
157 return navigation_controller_.get(); 158 return navigation_controller_.get();
158 } 159 }
159 EventSendingController* event_sending_controller() { 160 EventSendingController* event_sending_controller() {
160 return event_sending_controller_.get(); 161 return event_sending_controller_.get();
161 } 162 }
163 TestNotificationPresenter* notification_presenter() {
164 return notification_presenter_.get();
165 }
162 166
163 // Resets the LayoutTestController and EventSendingController. Should be 167 // Resets the LayoutTestController and EventSendingController. Should be
164 // called before loading a page, since some end-editing event notifications 168 // called before loading a page, since some end-editing event notifications
165 // may arrive after the previous page has finished dumping its text and 169 // may arrive after the previous page has finished dumping its text and
166 // therefore end up in the next test's results if the messages are still 170 // therefore end up in the next test's results if the messages are still
167 // enabled. 171 // enabled.
168 void ResetTestController(); 172 void ResetTestController();
169 173
170 // Passes options from LayoutTestController through to the delegate (or 174 // Passes options from LayoutTestController through to the delegate (or
171 // any other caller). 175 // any other caller).
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 385
382 // Default timeout in ms for file page loads when in layout test mode. 386 // Default timeout in ms for file page loads when in layout test mode.
383 static int file_test_timeout_ms_; 387 static int file_test_timeout_ms_;
384 388
385 scoped_ptr<AccessibilityController> accessibility_controller_; 389 scoped_ptr<AccessibilityController> accessibility_controller_;
386 scoped_ptr<LayoutTestController> layout_test_controller_; 390 scoped_ptr<LayoutTestController> layout_test_controller_;
387 scoped_ptr<EventSendingController> event_sending_controller_; 391 scoped_ptr<EventSendingController> event_sending_controller_;
388 scoped_ptr<PlainTextController> plain_text_controller_; 392 scoped_ptr<PlainTextController> plain_text_controller_;
389 scoped_ptr<TextInputController> text_input_controller_; 393 scoped_ptr<TextInputController> text_input_controller_;
390 scoped_ptr<TestNavigationController> navigation_controller_; 394 scoped_ptr<TestNavigationController> navigation_controller_;
395 scoped_ptr<TestNotificationPresenter> notification_presenter_;
391 396
392 scoped_ptr<TestWebViewDelegate> delegate_; 397 scoped_ptr<TestWebViewDelegate> delegate_;
393 scoped_ptr<TestWebViewDelegate> popup_delegate_; 398 scoped_ptr<TestWebViewDelegate> popup_delegate_;
394 399
395 base::WeakPtr<TestShell> devtools_shell_; 400 base::WeakPtr<TestShell> devtools_shell_;
396 scoped_ptr<TestShellDevToolsAgent> dev_tools_agent_; 401 scoped_ptr<TestShellDevToolsAgent> dev_tools_agent_;
397 scoped_ptr<TestShellDevToolsClient> dev_tools_client_; 402 scoped_ptr<TestShellDevToolsClient> dev_tools_client_;
398 403
399 const TestParams* test_params_; 404 const TestParams* test_params_;
400 405
(...skipping 19 matching lines...) Expand all
420 #if defined(OS_WIN) 425 #if defined(OS_WIN)
421 // Used by the watchdog to know when it's finished. 426 // Used by the watchdog to know when it's finished.
422 HANDLE finished_event_; 427 HANDLE finished_event_;
423 #endif 428 #endif
424 429
425 // Dump the stats table counters on exit. 430 // Dump the stats table counters on exit.
426 bool dump_stats_table_on_exit_; 431 bool dump_stats_table_on_exit_;
427 }; 432 };
428 433
429 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ 434 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
430
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/notification_presenter.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698