Cleanup: Move PopupOpeningObserver ownership from ChromeClient to ChromeClientImpl.

Source/core/page/ChromeClient.cpp

 /*
  * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2012, Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/page/ChromeClient.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLInputElement.h"
-#include "core/html/forms/ColorChooser.h"
-#include "core/html/forms/DateTimeChooser.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/HitTestResult.h"
 #include "core/page/FrameTree.h"
-#include "core/page/PopupOpeningObserver.h"
 #include "core/page/ScopedPageLoadDeferrer.h"
 #include "core/page/WindowFeatures.h"
-#include "platform/FileChooser.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/network/NetworkHints.h"
 #include "public/platform/WebScreenInfo.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/Vector.h"
 #include <algorithm>
 
 namespace blink {
 
 void ChromeClient::setWindowRect(const IntRect& pendingRect)
 {
     IntRect screen = screenInfo().availableRect;
     IntRect window = pendingRect;
 
     IntSize minimumSize = minimumWindowSize();
@@ skipping 52 matching lines @@
     ReturnType(ChromeClient::*function)(LocalFrame*, const String& message, Params&...),
     LocalFrame& frame,
     const String& message,
     Params&... parameters)
 {
     // Defer loads in case the client method runs a new event loop that would
     // otherwise cause the load to continue while we're in the middle of
     // executing JavaScript.
     ScopedPageLoadDeferrer deferrer;
 
-    chromeClient->notifyPopupOpeningObservers();
     ScopedJavaScriptDialogInstrumentation instrumentation(frame, message);
     return (chromeClient->*function)(&frame, message, parameters...);
 }
 
 bool ChromeClient::runBeforeUnloadConfirmPanel(const String& message, LocalFrame* frame)
 {
     return openJavaScriptDialog(this, &ChromeClient::runBeforeUnloadConfirmPanelInternal, *frame, message);
 }
 
 void ChromeClient::runJavaScriptAlert(LocalFrame* frame, const String& message)
@@ skipping 63 matching lines @@
 
 void ChromeClient::print(LocalFrame* frame)
 {
     // Defer loads in case the client method runs a new event loop that would
     // otherwise cause the load to continue while we're in the middle of executing JavaScript.
     ScopedPageLoadDeferrer deferrer;
 
     printInternal(frame);
 }
 
-PassOwnPtrWillBeRawPtr<ColorChooser> ChromeClient::createColorChooser(LocalFrame* frame, ColorChooserClient* client, const Color& initialColor)
-{
-    notifyPopupOpeningObservers();
-    return createColorChooserInternal(frame, client, initialColor);
-}
-
-PassRefPtr<DateTimeChooser> ChromeClient::openDateTimeChooser(DateTimeChooserClient* client, const DateTimeChooserParameters& parameters)
-{
-    notifyPopupOpeningObservers();
-    return openDateTimeChooserInternal(client, parameters);
-}
-
-void ChromeClient::openTextDataListChooser(HTMLInputElement& input)
-{
-    notifyPopupOpeningObservers();
-    openTextDataListChooserInternal(input);
-}
-
-void ChromeClient::runOpenPanel(LocalFrame* frame, PassRefPtr<FileChooser> fileChooser)
-{
-    notifyPopupOpeningObservers();
-    runOpenPanelInternal(frame, fileChooser);
-}
-
 void ChromeClient::setCursor(const Cursor& cursor)
 {
     m_lastSetMouseCursorForTesting = cursor;
     setCursorInternal(cursor);
 }
 
 Cursor ChromeClient::getLastSetCursorForTesting() const
 {
     return m_lastSetMouseCursorForTesting;
 }
 
-// --------
-
-PassRefPtrWillBeRawPtr<PopupMenu> ChromeClient::createPopupMenu(LocalFrame& frame, PopupMenuClient* client)
-{
-    notifyPopupOpeningObservers();
-    return createPopupMenuInternal(frame, client);
-}
-
-void ChromeClient::registerPopupOpeningObserver(PopupOpeningObserver* observer)
-{
-    ASSERT(observer);
-    m_popupOpeningObservers.append(observer);
-}
-
-void ChromeClient::unregisterPopupOpeningObserver(PopupOpeningObserver* observer)
-{
-    size_t index = m_popupOpeningObservers.find(observer);
-    ASSERT(index != kNotFound);
-    m_popupOpeningObservers.remove(index);
-}
-
-void ChromeClient::notifyPopupOpeningObservers() const
-{
-    const Vector<PopupOpeningObserver*> observers(m_popupOpeningObservers);
-    for (size_t i = 0; i < observers.size(); ++i)
-        observers[i]->willOpenPopup();
-}
-
 } // namespace blink