Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/WebViewImpl.h"
 
 #include <memory>
 #include "core/CSSValueKeywords.h"
 #include "core/HTMLNames.h"
 #include "core/clipboard/DataObject.h"
+#include "core/dom/ContextFeaturesClientImpl.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/LayoutTreeBuilderTraversal.h"
 #include "core/dom/Text.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/InputMethodController.h"
 #include "core/editing/iterators/TextIterator.h"
@@ skipping 36 matching lines @@
 #include "core/page/TouchDisambiguation.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/PaintLayer.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/credentialmanager/CredentialManagerClient.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "modules/storage/StorageNamespaceController.h"
+#include "modules/webdatabase/DatabaseClient.h"
 #include "modules/webgl/WebGLRenderingContext.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/Cursor.h"
 #include "platform/Histogram.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/animation/CompositorAnimationHost.h"
 #include "platform/exported/WebActiveGestureAnimation.h"
@@ skipping 41 matching lines @@
 #include "public/web/WebPluginAction.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebScopedUserGesture.h"
 #include "public/web/WebSelection.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWindowFeatures.h"
 #include "web/AnimationWorkletProxyClientImpl.h"
 #include "web/CompositionUnderlineVectorBuilder.h"
 #include "web/CompositorMutatorImpl.h"
 #include "web/CompositorWorkerProxyClientImpl.h"
-#include "web/ContextFeaturesClientImpl.h"
 #include "web/ContextMenuAllowedScope.h"
-#include "web/DatabaseClientImpl.h"
 #include "web/DedicatedWorkerMessagingProxyProviderImpl.h"
 #include "web/DevToolsEmulator.h"
 #include "web/FullscreenController.h"
 #include "web/InspectorOverlay.h"
 #include "web/LinkHighlightImpl.h"
 #include "web/PageOverlay.h"
 #include "web/PrerendererClientImpl.h"
 #include "web/ResizeViewportAnchor.h"
 #include "web/RotationViewportAnchor.h"
 #include "web/SpeechRecognitionClientProxy.h"
@@ skipping 231 matching lines @@
   pageClients.contextMenuClient = &m_contextMenuClientImpl;
   pageClients.editorClient = &m_editorClientImpl;
   pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
 
   m_page = Page::createOrdinary(pageClients);
   MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl);
   provideSpeechRecognitionTo(
       *m_page, SpeechRecognitionClientProxy::create(
                    client ? client->speechRecognizer() : nullptr));
   provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create());
-  provideDatabaseClientTo(*m_page, DatabaseClientImpl::create());
+  provideDatabaseClientTo(*m_page, new DatabaseClient);
 
   provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create());
   m_page->setValidationMessageClient(
       ValidationMessageClientImpl::create(*this));
   provideDedicatedWorkerMessagingProxyProviderTo(
       *m_page, DedicatedWorkerMessagingProxyProviderImpl::create(*m_page));
   StorageNamespaceController::provideStorageNamespaceTo(*m_page,
                                                         &m_storageClientImpl);
 
   setVisibilityState(visibilityState, true);
@@ skipping 3811 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink