Remove compile time flag ENABLE_PAGE_POPUP . This is part of an overall effort to remove unneeded c…

Source/WebKit/chromium/src/ChromeClientImpl.cpp

Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
index a0b2b9c84dad493ab1fb12b1a36a41acb3cb0ccc..d2a13bab967d2c9abbe6a293ac5a2418eac5f5ba 100644
--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -37,11 +37,7 @@
 #if ENABLE(INPUT_TYPE_COLOR)
 #include "core/platform/ColorChooser.h"
 #include "core/platform/ColorChooserClient.h"
-#if ENABLE(PAGE_POPUP)
 #include "ColorChooserPopupUIController.h"
-#else
-#include "ColorChooserUIController.h"
-#endif
 #endif
 #include "DateTimeChooserImpl.h"
 #include "ExternalDateTimeChooser.h"
@@ -145,9 +141,7 @@ ChromeClientImpl::ChromeClientImpl(WebViewImpl* webView)
     , m_menubarVisible(true)
     , m_resizable(true)
     , m_nextNewWindowNavigationPolicy(WebNavigationPolicyIgnore)
-#if ENABLE(PAGE_POPUP)
     , m_pagePopupDriver(webView)
-#endif
 {
 }
 
@@ -722,11 +716,7 @@ void ChromeClientImpl::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64
 PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(ColorChooserClient* chooserClient, const Color&)
 {
     OwnPtr<ColorChooserUIController> controller;
-#if ENABLE(PAGE_POPUP)
     controller = adoptPtr(new ColorChooserPopupUIController(this, chooserClient));
-#else
-    controller = adoptPtr(new ColorChooserUIController(this, chooserClient));

[tkent, 2013/05/07 21:20:23]

We need to check the runtime flag, and select either of
ColorChooserPopupUIController and ColorChooserUIController.

-#endif
     controller->openUI();
     return controller.release();
 }
@@ -1052,7 +1042,6 @@ PassRefPtr<SearchPopupMenu> ChromeClientImpl::createSearchPopupMenu(PopupMenuCli
     return adoptRef(new SearchPopupMenuChromium(client));
 }
 
-#if ENABLE(PAGE_POPUP)
 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRect& originBoundsInRootView)
 {
     ASSERT(m_pagePopupDriver);
@@ -1075,7 +1064,6 @@ void ChromeClientImpl::resetPagePopupDriver()
 {
     m_pagePopupDriver = m_webView;
 }
-#endif
 
 bool ChromeClientImpl::willAddTextFieldDecorationsTo(HTMLInputElement* input)
 {