| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/web_test_proxy.h" | 5 #include "content/shell/renderer/test_runner/web_test_proxy.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/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 delegate_->PrintMessage(std::string("createView(") + | 908 delegate_->PrintMessage(std::string("createView(") + |
| 909 URLDescription(request.url()) + ")\n"); | 909 URLDescription(request.url()) + ")\n"); |
| 910 return true; | 910 return true; |
| 911 } | 911 } |
| 912 | 912 |
| 913 blink::WebPlugin* WebTestProxyBase::CreatePlugin( | 913 blink::WebPlugin* WebTestProxyBase::CreatePlugin( |
| 914 blink::WebLocalFrame* frame, | 914 blink::WebLocalFrame* frame, |
| 915 const blink::WebPluginParams& params) { | 915 const blink::WebPluginParams& params) { |
| 916 if (TestPlugin::IsSupportedMimeType(params.mimeType)) | 916 if (TestPlugin::IsSupportedMimeType(params.mimeType)) |
| 917 return TestPlugin::create(frame, params, delegate_); | 917 return TestPlugin::create(frame, params, delegate_); |
| 918 return 0; | 918 return delegate_->CreatePluginPlaceholder(frame, params); |
| 919 } | 919 } |
| 920 | 920 |
| 921 void WebTestProxyBase::SetStatusText(const blink::WebString& text) { | 921 void WebTestProxyBase::SetStatusText(const blink::WebString& text) { |
| 922 if (!test_interfaces_->GetTestRunner()->shouldDumpStatusCallbacks()) | 922 if (!test_interfaces_->GetTestRunner()->shouldDumpStatusCallbacks()) |
| 923 return; | 923 return; |
| 924 delegate_->PrintMessage( | 924 delegate_->PrintMessage( |
| 925 std::string("UI DELEGATE STATUS CALLBACK: setStatusText:") + | 925 std::string("UI DELEGATE STATUS CALLBACK: setStatusText:") + |
| 926 text.utf8().data() + "\n"); | 926 text.utf8().data() + "\n"); |
| 927 } | 927 } |
| 928 | 928 |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1393 // to cancel the input method's ongoing composition session. | 1393 // to cancel the input method's ongoing composition session. |
| 1394 if (web_widget_) | 1394 if (web_widget_) |
| 1395 web_widget_->confirmComposition(); | 1395 web_widget_->confirmComposition(); |
| 1396 } | 1396 } |
| 1397 | 1397 |
| 1398 blink::WebString WebTestProxyBase::acceptLanguages() { | 1398 blink::WebString WebTestProxyBase::acceptLanguages() { |
| 1399 return blink::WebString::fromUTF8(accept_languages_); | 1399 return blink::WebString::fromUTF8(accept_languages_); |
| 1400 } | 1400 } |
| 1401 | 1401 |
| 1402 } // namespace content | 1402 } // namespace content |
| OLD | NEW |