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

Unified Diff: Source/web/ChromeClientImpl.cpp

Issue 1142303005: Remove legacy SELECT popup code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/web/PopupContainer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ChromeClientImpl.cpp
diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp
index 4467b5d5a09cef01ba17971489cc894f5823d177..e1fd0064bef88152be579a51609ad6de8d494dc3 100644
--- a/Source/web/ChromeClientImpl.cpp
+++ b/Source/web/ChromeClientImpl.cpp
@@ -91,14 +91,12 @@
#include "web/DateTimeChooserImpl.h"
#include "web/ExternalDateTimeChooser.h"
#include "web/ExternalPopupMenu.h"
-#include "web/PopupMenuChromium.h"
#include "web/PopupMenuImpl.h"
#include "web/WebFileChooserCompletionImpl.h"
#include "web/WebFrameWidgetImpl.h"
#include "web/WebInputEventConversion.h"
#include "web/WebLocalFrameImpl.h"
#include "web/WebPluginContainerImpl.h"
-#include "web/WebPopupMenuImpl.h"
#include "web/WebSettingsImpl.h"
#include "web/WebViewImpl.h"
#include "wtf/text/CString.h"
@@ -773,10 +771,8 @@ PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::openPopupMenu(LocalFrame& fr
if (WebViewImpl::useExternalPopupMenus())
return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webView));
- if (RuntimeEnabledFeatures::htmlPopupMenuEnabled() && RuntimeEnabledFeatures::pagePopupEnabled())
- return PopupMenuImpl::create(this, client);
-
- return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
+ ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
+ return PopupMenuImpl::create(this, client);
}
PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client)
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/web/PopupContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698