Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

content/renderer/render_view.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_VIEW_H_
 #define CONTENT_RENDERER_RENDER_VIEW_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 50 matching lines @@
 class ExternalHostBindings;
 class ExternalPopupMenu;
 class FilePath;
 class GeolocationDispatcher;
 class GURL;
 class LoadProgressTracker;
 class NavigationState;
 class NotificationProvider;
 class P2PSocketDispatcher;
 class PepperDeviceTest;
-class PrintWebViewHelper;
 class RenderViewObserver;
 class RenderViewVisitor;
 class SearchBox;
 class SkBitmap;
 class SpeechInputDispatcher;
-class SpellCheckProvider;
 class WebPluginDelegatePepper;
 class WebPluginDelegateProxy;
 class WebUIBindings;
 struct ContextMenuMediaParams;
 struct ExtensionMsg_ExecuteCode_Params;
 struct PP_Flash_NetAddress;
 struct ThumbnailScore;
 struct ViewHostMsg_GetSearchProviderInstallState_Params;
 struct ViewHostMsg_PageHasOSDD_Type;
 struct ViewHostMsg_RunFileChooser_Params;
@@ skipping 37 matching lines @@
 struct FormData;
 struct PasswordFormFillData;
 class ResourceFetcher;
 }
 
 namespace WebKit {
 class WebAccessibilityCache;
 class WebAccessibilityObject;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
+class WebAutoFillClient;
 class WebDataSource;
+class WebDevToolsAgentClient;
 class WebDocument;
 class WebDragData;
 class WebFrame;
 class WebGeolocationClient;
 class WebGeolocationServiceInterface;
 class WebImage;
 class WebInputElement;
 class WebKeyboardEvent;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
@@ skipping 38 matching lines @@
                    public WebKit::WebPageSerializerClient,
                    public webkit::npapi::WebPluginPageDelegate,
                    public base::SupportsWeakPtr<RenderView> {
  public:
   // Creates a new RenderView.  The parent_hwnd specifies a HWND to use as the
   // parent of the WebView HWND that will be created.  If this is a constrained
   // popup or as a new tab, opener_id is the routing ID of the RenderView
   // responsible for creating this RenderView (corresponding to parent_hwnd).
   // |counter| is either a currently initialized counter, or NULL (in which case
   // we treat this RenderView as a top level window).
-  static RenderView* Create(
-      RenderThreadBase* render_thread,
-      gfx::NativeViewId parent_hwnd,
-      int32 opener_id,
-      const RendererPreferences& renderer_prefs,
-      const WebPreferences& webkit_prefs,
-      SharedRenderViewCounter* counter,
-      int32 routing_id,
-      int64 session_storage_namespace_id,
-      const string16& frame_name);
+  static RenderView* Create(RenderThreadBase* render_thread,
+                            const WebPreferences& webkit_prefs,
+                            SharedRenderViewCounter* counter,
+                            int32 routing_id,
+                            int64 session_storage_namespace_id);
 
   // Visit all RenderViews with a live WebView (i.e., RenderViews that have
   // been closed but not yet destroyed are excluded).
   static void ForEach(RenderViewVisitor* visitor);
 
   // Returns the RenderView containing the given WebView.
   static RenderView* FromWebView(WebKit::WebView* webview);
 
   // Sets the "next page id" counter.
   static void SetNextPageID(int32 next_page_id);
 
+  void Init(gfx::NativeViewId parent_hwnd,
+            int32 opener_id,
+            const RendererPreferences& renderer_prefs,
+            const string16& frame_name,
+            WebKit::WebAutoFillClient* autofill_agent,
+            WebKit::WebDevToolsAgentClient* devtools_agent);
+
   // May return NULL when the view is closing.
   WebKit::WebView* webview() const;
 
   int browser_window_id() const {
     return browser_window_id_;
   }
 
   ViewType::Type view_type() const {
     return view_type_;
   }
@@ skipping 15 matching lines @@
   }
 
   // Returns true if we should display scrollbars for the given view size and
   // false if the scrollbars should be hidden.
   bool should_display_scrollbars(int width, int height) const {
     return (!send_preferred_size_changes_ ||
             (disable_scrollbars_size_limit_.width() <= width ||
              disable_scrollbars_size_limit_.height() <= height));
   }
 
-  SearchBox* searchbox() const { return searchbox_; }
-
   const WebKit::WebNode& context_menu_node() { return context_menu_node_; }
 
   // Current P2PSocketDispatcher. Set to NULL if P2P API is disabled.
   P2PSocketDispatcher* p2p_socket_dispatcher() {
     return p2p_socket_dispatcher_;
   }
 
   // Functions to add and remove observers for this object.
   void AddObserver(RenderViewObserver* observer);
   void RemoveObserver(RenderViewObserver* observer);
@@ skipping 392 matching lines @@
   friend class chrome::ChromeContentRendererClient;
 
   // For unit tests.
   friend class ExternalPopupMenuTest;
   friend class PepperDeviceTest;
   friend class RenderViewTest;
 
   FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange);
   FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase);
   FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, BlockScriptInitiatedPrinting);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, ImeComposition);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, InsertCharacters);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, JSBlockSentAfterPageLoad);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, LastCommittedUpdateState);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnHandleKeyboardEvent);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnImeStateChanged);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnNavStateChanged);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnPrintPages);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnSetTextDirection);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintLayoutTest);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintWithIframe);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, UpdateTargetURLWithInvalidURL);
 #if defined(OS_MACOSX)
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
 #endif
 
   typedef std::map<GURL, ContentSettings> HostContentSettings;
   typedef std::map<GURL, double> HostZoomLevels;
 
   // Cannot use std::set unfortunately since linked_ptr<> does not support
   // operator<.
@@ skipping 12 matching lines @@
     WebKit::WebAccessibilityNotification type;
   };
 
   enum ErrorPageType {
     DNS_ERROR,
     HTTP_404,
     CONNECTION_ERROR,
   };
 
   RenderView(RenderThreadBase* render_thread,
-             gfx::NativeViewId parent_hwnd,
-             int32 opener_id,
-             const RendererPreferences& renderer_prefs,
              const WebPreferences& webkit_prefs,
              SharedRenderViewCounter* counter,
              int32 routing_id,
-             int64 session_storage_namespace_id,
-             const string16& frame_name);
+             int64 session_storage_namespace_id);
 
   // Do not delete directly.  This class is reference counted.
   virtual ~RenderView();
 
   void UpdateURL(WebKit::WebFrame* frame);
   void UpdateTitle(WebKit::WebFrame* frame, const string16& title);
   void UpdateSessionHistory(WebKit::WebFrame* frame);
 
   // Update current main frame's encoding and send it to browser window.
   // Since we want to let users see the right encoding info from menu
@@ skipping 546 matching lines @@
 
   ScopedRunnableMethodFactory<RenderView> page_info_method_factory_;
   ScopedRunnableMethodFactory<RenderView> accessibility_method_factory_;
 
   RendererWebCookieJarImpl cookie_jar_;
 
   // The next group of objects all implement RenderViewObserver, so are deleted
   // along with the RenderView automatically.  This is why we just store weak
   // references.
 
-  // Provides access to this renderer from the remote Inspector UI.
-  DevToolsAgent* devtools_agent_;
-
   // DevToolsClient for renderer hosting developer tools UI. It's NULL for other
   // render views.
   DevToolsClient* devtools_client_;
 
   // Holds a reference to the service which provides desktop notifications.
   NotificationProvider* notification_provider_;
 
   // The geolocation dispatcher attached to this view, lazily initialized.
   GeolocationDispatcher* geolocation_dispatcher_;
 
   // The speech dispatcher attached to this view, lazily initialized.
   SpeechInputDispatcher* speech_input_dispatcher_;
 
   // Device orientation dispatcher attached to this view; lazily initialized.
   DeviceOrientationDispatcher* device_orientation_dispatcher_;
 
-  // PrintWebViewHelper handles printing.  Weak pointer since it implements
-  // RenderViewObserver interface.
-  PrintWebViewHelper* print_helper_;
-
-  // Weak pointer since it implements RenderViewObserver interface.
-  SearchBox* searchbox_;
-
-  // spellcheck provider which is registered as a view observer.
-  // Note that RenderViewObserver subclasses like this will be deleted
-  // automatically during RenderView destruction.
-  SpellCheckProvider* spellcheck_provider_;
-
   scoped_refptr<AudioMessageFilter> audio_message_filter_;
 
   // Handles accessibility requests into the renderer side, as well as
   // maintains the cache and other features of the accessibility tree.
   scoped_ptr<WebKit::WebAccessibilityCache> accessibility_;
 
   // Collect renderer accessibility notifications until they are ready to be
   // sent to the browser.
   std::vector<RendererAccessibilityNotification>
       pending_accessibility_notifications_;
@@ skipping 91 matching lines @@
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.  You can use
   // the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_H_