| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "content/shell/renderer/test_runner/WebTestProxy.h" | 5 #include "content/shell/renderer/test_runner/WebTestProxy.h" |
| 6 | 6 |
| 7 #include <cctype> | 7 #include <cctype> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "third_party/WebKit/public/web/WebHistoryItem.h" | 38 #include "third_party/WebKit/public/web/WebHistoryItem.h" |
| 39 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 39 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 40 #include "third_party/WebKit/public/web/WebMIDIClientMock.h" | 40 #include "third_party/WebKit/public/web/WebMIDIClientMock.h" |
| 41 #include "third_party/WebKit/public/web/WebNode.h" | 41 #include "third_party/WebKit/public/web/WebNode.h" |
| 42 #include "third_party/WebKit/public/web/WebPluginParams.h" | 42 #include "third_party/WebKit/public/web/WebPluginParams.h" |
| 43 #include "third_party/WebKit/public/web/WebPrintParams.h" | 43 #include "third_party/WebKit/public/web/WebPrintParams.h" |
| 44 #include "third_party/WebKit/public/web/WebRange.h" | 44 #include "third_party/WebKit/public/web/WebRange.h" |
| 45 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | 45 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
| 46 #include "third_party/WebKit/public/web/WebView.h" | 46 #include "third_party/WebKit/public/web/WebView.h" |
| 47 | 47 |
| 48 using namespace WebTestRunner; | |
| 49 using namespace blink; | 48 using namespace blink; |
| 50 using namespace std; | 49 using namespace std; |
| 51 | 50 |
| 52 namespace content { | 51 namespace content { |
| 53 | 52 |
| 54 namespace { | 53 namespace { |
| 55 | 54 |
| 56 class HostMethodTask : public WebMethodTask<WebTestProxyBase> { | 55 class HostMethodTask : public WebMethodTask<WebTestProxyBase> { |
| 57 public: | 56 public: |
| 58 typedef void (WebTestProxyBase::*CallbackMethodType)(); | 57 typedef void (WebTestProxyBase::*CallbackMethodType)(); |
| (...skipping 1238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1297 | 1296 |
| 1298 void WebTestProxyBase::resetInputMethod() | 1297 void WebTestProxyBase::resetInputMethod() |
| 1299 { | 1298 { |
| 1300 // If a composition text exists, then we need to let the browser process | 1299 // If a composition text exists, then we need to let the browser process |
| 1301 // to cancel the input method's ongoing composition session. | 1300 // to cancel the input method's ongoing composition session. |
| 1302 if (m_webWidget) | 1301 if (m_webWidget) |
| 1303 m_webWidget->confirmComposition(); | 1302 m_webWidget->confirmComposition(); |
| 1304 } | 1303 } |
| 1305 | 1304 |
| 1306 } // namespace content | 1305 } // namespace content |
| OLD | NEW |