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

Unified Diff: content/shell/renderer/test_runner/TestInterfaces.cpp

Issue 144013010: Move TextInputController from CppBoundClass to gin::Wrappable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: TextInputController1 -> TextInputController Created 6 years, 10 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
Index: content/shell/renderer/test_runner/TestInterfaces.cpp
diff --git a/content/shell/renderer/test_runner/TestInterfaces.cpp b/content/shell/renderer/test_runner/TestInterfaces.cpp
index fda4c2c197e1409de0e00faa3a8365b0b11dc3c2..71ac3f19b06e1770900c9dfbcbfdc7b16c152e29 100644
--- a/content/shell/renderer/test_runner/TestInterfaces.cpp
+++ b/content/shell/renderer/test_runner/TestInterfaces.cpp
@@ -10,7 +10,6 @@
#include "content/shell/renderer/test_runner/EventSender.h"
#include "content/shell/renderer/test_runner/GamepadController.h"
#include "content/shell/renderer/test_runner/TestRunner.h"
-#include "content/shell/renderer/test_runner/TextInputController.h"
#include "content/shell/renderer/test_runner/WebTestProxy.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
@@ -28,7 +27,6 @@ TestInterfaces::TestInterfaces()
: m_accessibilityController(new AccessibilityController())
, m_eventSender(new EventSender(this))
, m_gamepadController(new GamepadController())
- , m_textInputController(new TextInputController())
, m_testRunner(new TestRunner(this))
, m_delegate(0)
{
@@ -45,13 +43,11 @@ TestInterfaces::~TestInterfaces()
m_accessibilityController->setWebView(0);
m_eventSender->setWebView(0);
// m_gamepadController doesn't depend on WebView.
- m_textInputController->setWebView(0);
m_testRunner->setWebView(0, 0);
m_accessibilityController->setDelegate(0);
m_eventSender->setDelegate(0);
m_gamepadController->setDelegate(0);
- // m_textInputController doesn't depend on WebTestDelegate.
m_testRunner->setDelegate(0);
}
@@ -61,7 +57,6 @@ void TestInterfaces::setWebView(WebView* webView, WebTestProxyBase* proxy)
m_accessibilityController->setWebView(webView);
m_eventSender->setWebView(webView);
// m_gamepadController doesn't depend on WebView.
- m_textInputController->setWebView(webView);
m_testRunner->setWebView(webView, proxy);
}
@@ -70,7 +65,6 @@ void TestInterfaces::setDelegate(WebTestDelegate* delegate)
m_accessibilityController->setDelegate(delegate);
m_eventSender->setDelegate(delegate);
m_gamepadController->setDelegate(delegate);
- // m_textInputController doesn't depend on WebTestDelegate.
m_testRunner->setDelegate(delegate);
m_delegate = delegate;
}
@@ -80,7 +74,6 @@ void TestInterfaces::bindTo(WebFrame* frame)
m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
m_gamepadController->bindToJavascript(frame, WebString::fromUTF8("gamepadController"));
- m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController"));
m_testRunner->bindToJavascript(frame, WebString::fromUTF8("testRunner"));
m_testRunner->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
}
@@ -90,7 +83,6 @@ void TestInterfaces::resetTestHelperControllers()
m_accessibilityController->reset();
m_eventSender->reset();
m_gamepadController->reset();
- // m_textInputController doesn't have any state to reset.
WebCache::clear();
}

Powered by Google App Engine
This is Rietveld 408576698