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

Unified Diff: webkit/tools/test_shell/test_shell.cc

Issue 6296015: Remove eventSender, accessibilityController, plainText and (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/webkit/tools/test_shell
Patch Set: Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell.h ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.cc
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 399840eeaf66c319b4238855c7bc123aa647bad8..a08f4ad4a12ee3a31ecb5b73b0632e47a211877e 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -48,7 +48,6 @@
#include "webkit/glue/webpreferences.h"
#include "webkit/plugins/npapi/plugin_list.h"
#include "webkit/plugins/npapi/webplugininfo.h"
-#include "webkit/tools/test_shell/accessibility_controller.h"
#include "webkit/tools/test_shell/notification_presenter.h"
#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
#include "webkit/tools/test_shell/test_navigation_controller.h"
@@ -137,13 +136,9 @@ TestShell::TestShell()
allow_plugins_(true),
allow_scripts_(true),
dump_stats_table_on_exit_(false) {
- accessibility_controller_.reset(new AccessibilityController(this));
delegate_.reset(new TestWebViewDelegate(this));
popup_delegate_.reset(new TestWebViewDelegate(this));
layout_test_controller_.reset(new LayoutTestController(this));
- event_sending_controller_.reset(new EventSendingController(this));
- plain_text_controller_.reset(new PlainTextController(this));
- text_input_controller_.reset(new TextInputController(this));
navigation_controller_.reset(new TestNavigationController(this));
notification_presenter_.reset(new TestNotificationPresenter(this));
@@ -554,12 +549,7 @@ void TestShell::Show(WebNavigationPolicy policy) {
void TestShell::BindJSObjectsToWindow(WebFrame* frame) {
// Only bind the test classes if we're running tests.
if (layout_test_mode_) {
- accessibility_controller_->BindToJavascript(
- frame, "accessibilityController");
layout_test_controller_->BindToJavascript(frame, "layoutTestController");
- event_sending_controller_->BindToJavascript(frame, "eventSender");
- plain_text_controller_->BindToJavascript(frame, "plainText");
- text_input_controller_->BindToJavascript(frame, "textInputController");
}
}
@@ -644,9 +634,7 @@ void TestShell::SizeToDefault() {
}
void TestShell::ResetTestController() {
- accessibility_controller_->Reset();
layout_test_controller_->Reset();
- event_sending_controller_->Reset();
notification_presenter_->Reset();
delegate_->Reset();
if (geolocation_client_mock_.get())
« no previous file with comments | « webkit/tools/test_shell/test_shell.h ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698