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

Source/WebKit/chromium/src/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 19 matching lines @@
  */
 
 #include "config.h"
 #include "ChromeClientImpl.h"
 
 #include "core/accessibility/AXObjectCache.h"
 #include "core/accessibility/AccessibilityObject.h"
 #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"
 #include "ExternalPopupMenu.h"
 #include "HTMLNames.h"
 #include "WebAccessibilityObject.h"
 #include "WebAutofillClient.h"
 #include "bindings/v8/ScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
@@ skipping 83 matching lines @@
 }
 
 ChromeClientImpl::ChromeClientImpl(WebViewImpl* webView)
     : m_webView(webView)
     , m_toolbarsVisible(true)
     , m_statusbarVisible(true)
     , m_scrollbarsVisible(true)
     , m_menubarVisible(true)
     , m_resizable(true)
     , m_nextNewWindowNavigationPolicy(WebNavigationPolicyIgnore)
-#if ENABLE(PAGE_POPUP)
     , m_pagePopupDriver(webView)
-#endif
 {
 }
 
 ChromeClientImpl::~ChromeClientImpl()
 {
 }
 
 void* ChromeClientImpl::webView() const
 {
     return static_cast<void*>(m_webView);
@@ skipping 554 matching lines @@
 
 void ChromeClientImpl::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t)
 {
     ASSERT_NOT_REACHED();
 }
 
 #if ENABLE(INPUT_TYPE_COLOR)
 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();
 }
 PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChooserClient* chooserClient, const WebColor& initialColor)
 {
     WebViewClient* client = m_webView->client();
     if (!client)
         return nullptr;
     return adoptPtr(client->createColorChooser(chooserClient, initialColor));
 }
@@ skipping 305 matching lines @@
         return adoptRef(new ExternalPopupMenu(client, m_webView->client()));
 
     return adoptRef(new PopupMenuChromium(client));
 }
 
 PassRefPtr<SearchPopupMenu> ChromeClientImpl::createSearchPopupMenu(PopupMenuClient* client) const
 {
     return adoptRef(new SearchPopupMenuChromium(client));
 }
 
-#if ENABLE(PAGE_POPUP)
 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRect& originBoundsInRootView)
 {
     ASSERT(m_pagePopupDriver);
     return m_pagePopupDriver->openPagePopup(client, originBoundsInRootView);
 }
 
 void ChromeClientImpl::closePagePopup(PagePopup* popup)
 {
     ASSERT(m_pagePopupDriver);
     m_pagePopupDriver->closePagePopup(popup);
 }
 
 void ChromeClientImpl::setPagePopupDriver(PagePopupDriver* driver)
 {
     ASSERT(driver);
     m_pagePopupDriver = driver;
 }
 
 void ChromeClientImpl::resetPagePopupDriver()
 {
     m_pagePopupDriver = m_webView;
 }
-#endif
 
 bool ChromeClientImpl::willAddTextFieldDecorationsTo(HTMLInputElement* input)
 {
     ASSERT(input);
     const Vector<OwnPtr<TextFieldDecorator> >& decorators = m_webView->textFieldDecorators();
     for (unsigned i = 0; i < decorators.size(); ++i) {
         if (decorators[i]->willAddDecorationTo(input))
             return true;
     }
     return false;
@@ skipping 109 matching lines @@
 {
 }
 
 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
 { 
     m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
 } 
 #endif
 
 } // namespace WebKit