Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011, 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 116 // Do not use this method. It's been replaced by createExternalPopupMenu. | 116 // Do not use this method. It's been replaced by createExternalPopupMenu. |
| 117 ASSERT_NOT_REACHED(); | 117 ASSERT_NOT_REACHED(); |
| 118 return 0; | 118 return 0; |
| 119 } | 119 } |
| 120 | 120 |
| 121 WebStorageNamespace* WebViewHost::createSessionStorageNamespace(unsigned quota) | 121 WebStorageNamespace* WebViewHost::createSessionStorageNamespace(unsigned quota) |
| 122 { | 122 { |
| 123 return webkit_support::CreateSessionStorageNamespace(quota); | 123 return webkit_support::CreateSessionStorageNamespace(quota); |
| 124 } | 124 } |
| 125 | 125 |
| 126 WebKit::WebColorChooser* WebViewHost::createColorChooser(WebKit::WebColorChooser Client* client, const WebKit::WebColor&) | |
|
jochen (gone - plz use gerrit)
2013/05/21 07:11:06
instead of implementing this here, you should impl
| |
| 127 { | |
| 128 return proxy()->createColorChooser(client); | |
| 129 } | |
| 130 | |
| 126 void WebViewHost::didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine) | 131 void WebViewHost::didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine) |
| 127 { | 132 { |
| 128 } | 133 } |
| 129 | 134 |
| 130 void WebViewHost::didStartLoading() | 135 void WebViewHost::didStartLoading() |
| 131 { | 136 { |
| 132 } | 137 } |
| 133 | 138 |
| 134 void WebViewHost::didStopLoading() | 139 void WebViewHost::didStopLoading() |
| 135 { | 140 { |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 587 void WebViewHost::showDevTools() | 592 void WebViewHost::showDevTools() |
| 588 { | 593 { |
| 589 m_shell->showDevTools(); | 594 m_shell->showDevTools(); |
| 590 } | 595 } |
| 591 | 596 |
| 592 void WebViewHost::closeDevTools() | 597 void WebViewHost::closeDevTools() |
| 593 { | 598 { |
| 594 m_shell->closeDevTools(); | 599 m_shell->closeDevTools(); |
| 595 } | 600 } |
| 596 | 601 |
| 602 void WebViewHost::didOpenChooser() OVERRIDE | |
| 603 { | |
| 604 m_chooserCount++; | |
| 605 } | |
| 606 | |
| 607 void WebViewHost::didCloseChooser() OVERRIDE | |
| 608 { | |
| 609 m_chooserCount--; | |
| 610 } | |
| 611 | |
| 612 bool WebViewHost::isChooserShown() OVERRIDE | |
| 613 { | |
| 614 return 0 < m_chooserCount; | |
| 615 } | |
| 616 | |
| 597 void WebViewHost::evaluateInWebInspector(long callID, const std::string& script) | 617 void WebViewHost::evaluateInWebInspector(long callID, const std::string& script) |
| 598 { | 618 { |
| 599 m_shell->drtDevToolsAgent()->evaluateInWebInspector(callID, script); | 619 m_shell->drtDevToolsAgent()->evaluateInWebInspector(callID, script); |
| 600 } | 620 } |
| 601 | 621 |
| 602 void WebViewHost::clearAllDatabases() | 622 void WebViewHost::clearAllDatabases() |
| 603 { | 623 { |
| 604 webkit_support::ClearAllDatabases(); | 624 webkit_support::ClearAllDatabases(); |
| 605 } | 625 } |
| 606 | 626 |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 735 ); | 755 ); |
| 736 } | 756 } |
| 737 | 757 |
| 738 // Public functions ----------------------------------------------------------- | 758 // Public functions ----------------------------------------------------------- |
| 739 | 759 |
| 740 WebViewHost::WebViewHost(TestShell* shell) | 760 WebViewHost::WebViewHost(TestShell* shell) |
| 741 : m_shell(shell) | 761 : m_shell(shell) |
| 742 , m_proxy(0) | 762 , m_proxy(0) |
| 743 , m_webWidget(0) | 763 , m_webWidget(0) |
| 744 , m_shutdownWasInvoked(false) | 764 , m_shutdownWasInvoked(false) |
| 765 , m_chooserCount(0) | |
| 745 { | 766 { |
| 746 reset(); | 767 reset(); |
| 747 } | 768 } |
| 748 | 769 |
| 749 WebViewHost::~WebViewHost() | 770 WebViewHost::~WebViewHost() |
| 750 { | 771 { |
| 751 ASSERT(m_shutdownWasInvoked); | 772 ASSERT(m_shutdownWasInvoked); |
| 752 if (m_inModalLoop) | 773 if (m_inModalLoop) |
| 753 webkit_support::QuitMessageLoop(); | 774 webkit_support::QuitMessageLoop(); |
| 754 } | 775 } |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 999 webView()->willExitFullScreen(); | 1020 webView()->willExitFullScreen(); |
| 1000 webView()->didExitFullScreen(); | 1021 webView()->didExitFullScreen(); |
| 1001 } | 1022 } |
| 1002 | 1023 |
| 1003 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() | 1024 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() |
| 1004 { | 1025 { |
| 1005 if (!m_testMediaStreamClient.get()) | 1026 if (!m_testMediaStreamClient.get()) |
| 1006 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl ient()); | 1027 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl ient()); |
| 1007 return m_testMediaStreamClient.get(); | 1028 return m_testMediaStreamClient.get(); |
| 1008 } | 1029 } |
| OLD | NEW |