Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 916 { | 916 { |
| 917 if (!m_testInterfaces->testRunner()->canOpenWindows()) | 917 if (!m_testInterfaces->testRunner()->canOpenWindows()) |
| 918 return false; | 918 return false; |
| 919 if (m_testInterfaces->testRunner()->shouldDumpCreateView()) | 919 if (m_testInterfaces->testRunner()->shouldDumpCreateView()) |
| 920 m_delegate->printMessage(string("createView(") + URLDescription(request. url()) + ")\n"); | 920 m_delegate->printMessage(string("createView(") + URLDescription(request. url()) + ")\n"); |
| 921 return true; | 921 return true; |
| 922 } | 922 } |
| 923 | 923 |
| 924 WebPlugin* WebTestProxyBase::createPlugin(WebFrame* frame, const WebPluginParams & params) | 924 WebPlugin* WebTestProxyBase::createPlugin(WebFrame* frame, const WebPluginParams & params) |
| 925 { | 925 { |
| 926 if (params.mimeType == TestPlugin::mimeType()) | 926 if (params.mimeType.utf8().find(TestPlugin::mimeType().utf8(), 0) != std::st ring::npos) |
|
eseidel
2013/12/18 18:38:18
TestPlugin::isSupportedMimeType(params.mimeType) w
wjmaclean
2013/12/23 23:49:53
Done.
| |
| 927 return TestPlugin::create(frame, params, m_delegate); | 927 return TestPlugin::create(frame, params, m_delegate); |
| 928 return 0; | 928 return 0; |
| 929 } | 929 } |
| 930 | 930 |
| 931 void WebTestProxyBase::setStatusText(const WebString& text) | 931 void WebTestProxyBase::setStatusText(const WebString& text) |
| 932 { | 932 { |
| 933 if (!m_testInterfaces->testRunner()->shouldDumpStatusCallbacks()) | 933 if (!m_testInterfaces->testRunner()->shouldDumpStatusCallbacks()) |
| 934 return; | 934 return; |
| 935 m_delegate->printMessage(string("UI DELEGATE STATUS CALLBACK: setStatusText: ") + text.utf8().data() + "\n"); | 935 m_delegate->printMessage(string("UI DELEGATE STATUS CALLBACK: setStatusText: ") + text.utf8().data() + "\n"); |
| 936 } | 936 } |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1385 | 1385 |
| 1386 void WebTestProxyBase::resetInputMethod() | 1386 void WebTestProxyBase::resetInputMethod() |
| 1387 { | 1387 { |
| 1388 // If a composition text exists, then we need to let the browser process | 1388 // If a composition text exists, then we need to let the browser process |
| 1389 // to cancel the input method's ongoing composition session. | 1389 // to cancel the input method's ongoing composition session. |
| 1390 if (m_webWidget) | 1390 if (m_webWidget) |
| 1391 m_webWidget->confirmComposition(); | 1391 m_webWidget->confirmComposition(); |
| 1392 } | 1392 } |
| 1393 | 1393 |
| 1394 } | 1394 } |
| OLD | NEW |