Skip to content

Commit

Permalink
Reland "Move TextInputController from CppBoundClass to gin::Wrappable."
Browse files Browse the repository at this point in the history
Also, change the class to use chromium coding style.

BUG=297480, 331301
R=jochen@chromium.org

Review URL: https://codereview.chromium.org/169683006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251773 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tfarina@chromium.org committed Feb 18, 2014
1 parent b1cf226 commit f751653
Show file tree
Hide file tree
Showing 7 changed files with 317 additions and 244 deletions.
4 changes: 2 additions & 2 deletions content/content_shell.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@
'shell/renderer/test_runner/TestPlugin.h',
'shell/renderer/test_runner/TestRunner.cpp',
'shell/renderer/test_runner/TestRunner.h',
'shell/renderer/test_runner/TextInputController.cpp',
'shell/renderer/test_runner/TextInputController.h',
'shell/renderer/test_runner/WebAXObjectProxy.cpp',
'shell/renderer/test_runner/WebAXObjectProxy.h',
'shell/renderer/test_runner/WebFrameTestProxy.h',
Expand All @@ -243,6 +241,8 @@
'shell/renderer/test_runner/WebUserMediaClientMock.h',
'shell/renderer/test_runner/gamepad_controller.cc',
'shell/renderer/test_runner/gamepad_controller.h',
'shell/renderer/test_runner/text_input_controller.cc',
'shell/renderer/test_runner/text_input_controller.h',
'shell/renderer/webkit_test_runner.cc',
'shell/renderer/webkit_test_runner.h',
'test/layouttest_support.cc',
Expand Down
10 changes: 5 additions & 5 deletions content/shell/renderer/test_runner/TestInterfaces.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#include "content/shell/renderer/test_runner/AccessibilityController.h"
#include "content/shell/renderer/test_runner/EventSender.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 "content/shell/renderer/test_runner/gamepad_controller.h"
#include "content/shell/renderer/test_runner/text_input_controller.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/web/WebCache.h"
Expand All @@ -29,7 +29,7 @@ TestInterfaces::TestInterfaces()
: m_accessibilityController(new AccessibilityController())
, m_eventSender(new EventSender(this))
, m_gamepadController(new content::GamepadController())
, m_textInputController(new TextInputController())
, m_textInputController(new content::TextInputController())
, m_testRunner(new TestRunner(this))
, m_delegate(0)
{
Expand All @@ -46,7 +46,7 @@ TestInterfaces::~TestInterfaces()
m_accessibilityController->setWebView(0);
m_eventSender->setWebView(0);
// m_gamepadController doesn't depend on WebView.
m_textInputController->setWebView(0);
m_textInputController->SetWebView(NULL);
m_testRunner->setWebView(0, 0);

m_accessibilityController->setDelegate(0);
Expand All @@ -62,7 +62,7 @@ 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_textInputController->SetWebView(webView);
m_testRunner->setWebView(webView, proxy);
}

Expand All @@ -81,7 +81,7 @@ void TestInterfaces::bindTo(WebFrame* frame)
m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
m_gamepadController->Install(frame);
m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController"));
m_textInputController->Install(frame);
m_testRunner->bindToJavascript(frame, WebString::fromUTF8("testRunner"));
m_testRunner->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
}
Expand Down
4 changes: 2 additions & 2 deletions content/shell/renderer/test_runner/TestInterfaces.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ class WebView;

namespace content {
class GamepadController;
class TextInputController;
}

namespace WebTestRunner {

class AccessibilityController;
class EventSender;
class TestRunner;
class TextInputController;
class WebTestDelegate;
class WebTestProxyBase;

Expand Down Expand Up @@ -65,7 +65,7 @@ class TestInterfaces {
scoped_ptr<AccessibilityController> m_accessibilityController;
scoped_ptr<EventSender> m_eventSender;
scoped_ptr<content::GamepadController> m_gamepadController;
scoped_ptr<TextInputController> m_textInputController;
scoped_ptr<content::TextInputController> m_textInputController;
scoped_ptr<TestRunner> m_testRunner;
WebTestDelegate* m_delegate;
WebTestProxyBase* m_proxy;
Expand Down
193 changes: 0 additions & 193 deletions content/shell/renderer/test_runner/TextInputController.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions content/shell/renderer/test_runner/TextInputController.h

This file was deleted.

Loading

0 comments on commit f751653

Please sign in to comment.