OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #include "public/web/WebUserGestureIndicator.h" | 84 #include "public/web/WebUserGestureIndicator.h" |
85 #include "public/web/WebUserGestureToken.h" | 85 #include "public/web/WebUserGestureToken.h" |
86 #include "public/web/WebViewClient.h" | 86 #include "public/web/WebViewClient.h" |
87 #include "public/web/WebWindowFeatures.h" | 87 #include "public/web/WebWindowFeatures.h" |
88 #include "web/ColorChooserPopupUIController.h" | 88 #include "web/ColorChooserPopupUIController.h" |
89 #include "web/ColorChooserUIController.h" | 89 #include "web/ColorChooserUIController.h" |
90 #include "web/DateTimeChooserImpl.h" | 90 #include "web/DateTimeChooserImpl.h" |
91 #include "web/ExternalDateTimeChooser.h" | 91 #include "web/ExternalDateTimeChooser.h" |
92 #include "web/ExternalPopupMenu.h" | 92 #include "web/ExternalPopupMenu.h" |
93 #include "web/PopupMenuChromium.h" | 93 #include "web/PopupMenuChromium.h" |
| 94 #include "web/PopupMenuImpl.h" |
94 #include "web/WebFileChooserCompletionImpl.h" | 95 #include "web/WebFileChooserCompletionImpl.h" |
95 #include "web/WebInputEventConversion.h" | 96 #include "web/WebInputEventConversion.h" |
96 #include "web/WebLocalFrameImpl.h" | 97 #include "web/WebLocalFrameImpl.h" |
97 #include "web/WebPluginContainerImpl.h" | 98 #include "web/WebPluginContainerImpl.h" |
98 #include "web/WebPopupMenuImpl.h" | 99 #include "web/WebPopupMenuImpl.h" |
99 #include "web/WebSettingsImpl.h" | 100 #include "web/WebSettingsImpl.h" |
100 #include "web/WebViewImpl.h" | 101 #include "web/WebViewImpl.h" |
101 #include "wtf/text/CString.h" | 102 #include "wtf/text/CString.h" |
102 #include "wtf/text/StringBuilder.h" | 103 #include "wtf/text/StringBuilder.h" |
103 #include "wtf/text/StringConcatenate.h" | 104 #include "wtf/text/StringConcatenate.h" |
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
722 bool ChromeClientImpl::hasOpenedPopup() const | 723 bool ChromeClientImpl::hasOpenedPopup() const |
723 { | 724 { |
724 return m_webView->hasOpenedPopup(); | 725 return m_webView->hasOpenedPopup(); |
725 } | 726 } |
726 | 727 |
727 PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame&
frame, PopupMenuClient* client) | 728 PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame&
frame, PopupMenuClient* client) |
728 { | 729 { |
729 if (WebViewImpl::useExternalPopupMenus()) | 730 if (WebViewImpl::useExternalPopupMenus()) |
730 return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webVie
w)); | 731 return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webVie
w)); |
731 | 732 |
| 733 if (RuntimeEnabledFeatures::htmlPopupMenuEnabled() && RuntimeEnabledFeatures
::pagePopupEnabled()) |
| 734 return PopupMenuImpl::create(this, client); |
| 735 |
732 return adoptRefWillBeNoop(new PopupMenuChromium(frame, client)); | 736 return adoptRefWillBeNoop(new PopupMenuChromium(frame, client)); |
733 } | 737 } |
734 | 738 |
735 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRec
t& originBoundsInRootView) | 739 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRec
t& originBoundsInRootView) |
736 { | 740 { |
737 return m_webView->openPagePopup(client, originBoundsInRootView); | 741 return m_webView->openPagePopup(client, originBoundsInRootView); |
738 } | 742 } |
739 | 743 |
740 void ChromeClientImpl::closePagePopup(PagePopup* popup) | 744 void ChromeClientImpl::closePagePopup(PagePopup* popup) |
741 { | 745 { |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
863 { | 867 { |
864 // FIXME: remove. See http://crbug.com/425756 | 868 // FIXME: remove. See http://crbug.com/425756 |
865 if (m_webView->autofillClient()) | 869 if (m_webView->autofillClient()) |
866 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in
put)); | 870 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in
put)); |
867 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(input.document().
frame()); | 871 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(input.document().
frame()); |
868 if (webframe->autofillClient()) | 872 if (webframe->autofillClient()) |
869 webframe->autofillClient()->openTextDataListChooser(WebInputElement(&inp
ut)); | 873 webframe->autofillClient()->openTextDataListChooser(WebInputElement(&inp
ut)); |
870 } | 874 } |
871 | 875 |
872 } // namespace blink | 876 } // namespace blink |
OLD | NEW |