Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: Source/web/ChromeClientImpl.cpp

Issue 736883002: Implement <select> Popup Menu using PagePopup (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed tests for mac Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/web/ColorChooserPopupUIController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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/WebFrameWidgetImpl.h" 96 #include "web/WebFrameWidgetImpl.h"
96 #include "web/WebInputEventConversion.h" 97 #include "web/WebInputEventConversion.h"
97 #include "web/WebLocalFrameImpl.h" 98 #include "web/WebLocalFrameImpl.h"
98 #include "web/WebPluginContainerImpl.h" 99 #include "web/WebPluginContainerImpl.h"
99 #include "web/WebPopupMenuImpl.h" 100 #include "web/WebPopupMenuImpl.h"
100 #include "web/WebSettingsImpl.h" 101 #include "web/WebSettingsImpl.h"
101 #include "web/WebViewImpl.h" 102 #include "web/WebViewImpl.h"
102 #include "wtf/text/CString.h" 103 #include "wtf/text/CString.h"
103 #include "wtf/text/StringBuilder.h" 104 #include "wtf/text/StringBuilder.h"
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 bool ChromeClientImpl::hasOpenedPopup() const 737 bool ChromeClientImpl::hasOpenedPopup() const
737 { 738 {
738 return m_webView->hasOpenedPopup(); 739 return m_webView->hasOpenedPopup();
739 } 740 }
740 741
741 PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame& frame, PopupMenuClient* client) 742 PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame& frame, PopupMenuClient* client)
742 { 743 {
743 if (WebViewImpl::useExternalPopupMenus()) 744 if (WebViewImpl::useExternalPopupMenus())
744 return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webVie w)); 745 return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webVie w));
745 746
747 if (RuntimeEnabledFeatures::htmlPopupMenuEnabled() && RuntimeEnabledFeatures ::pagePopupEnabled())
748 return PopupMenuImpl::create(this, client);
749
746 return adoptRefWillBeNoop(new PopupMenuChromium(frame, client)); 750 return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
747 } 751 }
748 752
749 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRec t& originBoundsInRootView) 753 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRec t& originBoundsInRootView)
750 { 754 {
751 return m_webView->openPagePopup(client, originBoundsInRootView); 755 return m_webView->openPagePopup(client, originBoundsInRootView);
752 } 756 }
753 757
754 void ChromeClientImpl::closePagePopup(PagePopup* popup) 758 void ChromeClientImpl::closePagePopup(PagePopup* popup)
755 { 759 {
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 webframe->autofillClient()->dataListOptionsChanged(WebInputElement(&inpu t)); 885 webframe->autofillClient()->dataListOptionsChanged(WebInputElement(&inpu t));
882 } 886 }
883 887
884 void ChromeClientImpl::registerViewportLayers() const 888 void ChromeClientImpl::registerViewportLayers() const
885 { 889 {
886 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView() && m_webVie w->pinchVirtualViewportEnabled()) 890 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView() && m_webVie w->pinchVirtualViewportEnabled())
887 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie w(m_webView->layerTreeView()); 891 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie w(m_webView->layerTreeView());
888 } 892 }
889 893
890 } // namespace blink 894 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/web/ColorChooserPopupUIController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698