Rename RenderView to RenderViewImpl. Update Chrome's DEPS so that it can't include the RenderView...

content/renderer/render_view_impl.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_
+#ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
+#define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 23 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h"
 #include "ui/gfx/surface/transport_dib.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 
 #if defined(OS_WIN)
-// RenderView is a diamond-shaped hierarchy, with WebWidgetClient at the root.
-// VS warns when we inherit the WebWidgetClient method implementations from
-// RenderWidget.  It's safe to ignore that warning.
+// RenderViewImpl is a diamond-shaped hierarchy, with WebWidgetClient at the
+// root. VS warns when we inherit the WebWidgetClient method implementations
+// from RenderWidget.  It's safe to ignore that warning.
 #pragma warning(disable: 4250)
 #endif
 
 class AudioMessageFilter;
 class DeviceOrientationDispatcher;
 class DevToolsAgent;
 class ExternalPopupMenu;
 class GeolocationDispatcher;
 class GURL;
 class IntentsDispatcher;
@@ skipping 77 matching lines @@
 struct WebPoint;
 struct WebWindowFeatures;
 }
 
 // We need to prevent a page from trying to create infinite popups. It is not
 // as simple as keeping a count of the number of immediate children
 // popups. Having an html file that window.open()s itself would create
 // an unlimited chain of RenderViews who only have one RenderView child.
 //
 // Therefore, each new top level RenderView creates a new counter and shares it
-// with all its children and grandchildren popup RenderViews created with
+// with all its children and grandchildren popup RenderViewImpls created with
 // createView() to have a sort of global limit for the page so no more than
 // kMaximumNumberOfPopups popups are created.
 //
 // This is a RefCounted holder of an int because I can't say
 // scoped_refptr<int>.
 typedef base::RefCountedData<int> SharedRenderViewCounter;
 
 //
 // RenderView is an object that manages a WebView object, and provides a
 // communication interface with an embedding application process
 //
-class RenderView : public RenderWidget,
-                   public WebKit::WebViewClient,
-                   public WebKit::WebFrameClient,
-                   public WebKit::WebPageSerializerClient,
-                   public content::RenderView,
-                   public webkit::npapi::WebPluginPageDelegate,
-                   public base::SupportsWeakPtr<RenderView> {
+class RenderViewImpl : public RenderWidget,
+                       public WebKit::WebViewClient,
+                       public WebKit::WebFrameClient,
+                       public WebKit::WebPageSerializerClient,
+                       public content::RenderView,
+                       public webkit::npapi::WebPluginPageDelegate,
+                       public base::SupportsWeakPtr<RenderViewImpl> {
  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 blocked
   // 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).
-  CONTENT_EXPORT static RenderView* Create(
+  CONTENT_EXPORT static RenderViewImpl* Create(
       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);
 
-  // Returns the RenderView containing the given WebView.
-  CONTENT_EXPORT static RenderView* FromWebView(WebKit::WebView* webview);
+  // Returns the RenderViewImpl containing the given WebView.
+  CONTENT_EXPORT static RenderViewImpl* FromWebView(WebKit::WebView* webview);
 
   // Sets the "next page id" counter.
   static void SetNextPageID(int32 next_page_id);
 
   // May return NULL when the view is closing.
   CONTENT_EXPORT WebKit::WebView* webview() const;
 
   // Called by a GraphicsContext associated with this view when swapbuffers
   // is posted, completes or is aborted.
   void OnViewContextSwapBuffersPosted();
@@ skipping 466 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, SetHistoryLengthAndPrune);
 
   typedef std::map<GURL, double> HostZoomLevels;
 
   enum ErrorPageType {
     DNS_ERROR,
     HTTP_404,
     CONNECTION_ERROR,
   };
 
-  RenderView(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);
+  RenderViewImpl(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);
 
   // Do not delete directly.  This class is reference counted.
-  virtual ~RenderView();
+  virtual ~RenderViewImpl();
 
   void UpdateURL(WebKit::WebFrame* frame);
   void UpdateTitle(WebKit::WebFrame* frame, const string16& title,
                    WebKit::WebTextDirection title_direction);
   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
   // before finishing loading, we call the UpdateEncoding in
   // a) function:DidCommitLoadForFrame. When this function is called,
@@ skipping 162 matching lines @@
 
   // Check whether the preferred size has changed.
   void CheckPreferredSize();
 
   // This callback is triggered when DownloadFavicon completes, either
   // succesfully or with a failure. See DownloadFavicon for more
   // details.
   void DidDownloadFavicon(webkit_glue::ImageResourceFetcher* fetcher,
                           const SkBitmap& image);
 
-  // Requests to download a favicon image. When done, the RenderView
-  // is notified by way of DidDownloadFavicon. Returns true if the
-  // request was successfully started, false otherwise. id is used to
-  // uniquely identify the request and passed back to the
-  // DidDownloadFavicon method. If the image has multiple frames, the
-  // frame whose size is image_size is returned. If the image doesn't
-  // have a frame at the specified size, the first is returned.
+  // Requests to download a favicon image. When done, the RenderView is notified
+  // by way of DidDownloadFavicon. Returns true if the request was successfully
+  // started, false otherwise. id is used to uniquely identify the request and
+  // passed back to the DidDownloadFavicon method. If the image has multiple
+  // frames, the frame whose size is image_size is returned. If the image
+  // doesn't have a frame at the specified size, the first is returned.
   bool DownloadFavicon(int id, const GURL& image_url, int image_size);
 
   GURL GetAlternateErrorPageURL(const GURL& failed_url,
                                 ErrorPageType error_type);
 
   // Locates a sub frame with given xpath
   WebKit::WebFrame* GetChildFrame(const string16& frame_xpath) const;
 
   // Returns the opener url if present, else an empty url.
   GURL GetOpenerUrl() const;
@@ skipping 101 matching lines @@
   // It is empty if there is no top-level client-side redirect.
   GURL completed_client_redirect_src_;
 
   // Holds state pertaining to a navigation that we initiated.  This is held by
   // the WebDataSource::ExtraData attribute.  We use pending_navigation_state_
   // as a temporary holder for the state until the WebDataSource corresponding
   // to the new navigation is created.  See DidCreateDataSource.
   scoped_ptr<content::NavigationState> pending_navigation_state_;
 
   // Timer used to delay the updating of nav state (see SyncNavigationState).
-  base::OneShotTimer<RenderView> nav_state_sync_timer_;
+  base::OneShotTimer<RenderViewImpl> nav_state_sync_timer_;
 
   // Page IDs ------------------------------------------------------------------
   // See documentation in content::RenderView.
   int32 page_id_;
 
   // Indicates the ID of the last page that we sent a FrameNavigate to the
   // browser for. This is used to determine if the most recent transition
   // generated a history entry (less than page_id_), or not (equal to or
   // greater than). Note that this will be greater than page_id_ if the user
   // goes back.
@@ skipping 59 matching lines @@
   RenderViewSelection last_selection_;
 
   // View ----------------------------------------------------------------------
 
   // Cache the preferred size of the page in order to prevent sending the IPC
   // when layout() recomputes but doesn't actually change sizes.
   gfx::Size preferred_size_;
 
   // Used to delay determining the preferred size (to avoid intermediate
   // states for the sizes).
-  base::OneShotTimer<RenderView> check_preferred_size_timer_;
+  base::OneShotTimer<RenderViewImpl> check_preferred_size_timer_;
 
   // These store the "is main frame is scrolled all the way to the left
   // or right" state that was last sent to the browser.
   bool cached_is_main_frame_pinned_to_left_;
   bool cached_is_main_frame_pinned_to_right_;
 
   // These store the "has scrollbars" state last sent to the browser.
   bool cached_has_main_frame_horizontal_scrollbar_;
   bool cached_has_main_frame_vertical_scrollbar_;
 
 #if defined(OS_MACOSX)
   // Track the fake plugin window handles allocated on the browser side for
   // the accelerated compositor and (currently) accelerated plugins so that
   // we can discard them when the view goes away.
   std::set<gfx::PluginWindowHandle> fake_plugin_window_handles_;
 #endif
 
   // Plugins -------------------------------------------------------------------
 
   PepperPluginDelegateImpl pepper_delegate_;
 
-  // All the currently active plugin delegates for this RenderView; kept so that
-  // we can enumerate them to send updates about things like window location
-  // or tab focus and visibily. These are non-owning references.
+  // All the currently active plugin delegates for this RenderView; kept so
+  // that we can enumerate them to send updates about things like window
+  // location or tab focus and visibily. These are non-owning references.
   std::set<WebPluginDelegateProxy*> plugin_delegates_;
 
 #if defined(OS_WIN)
   // The ID of the focused NPAPI plug-in.
   int focused_plugin_id_;
 #endif
 
   // Helper objects ------------------------------------------------------------
 
   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.
+  // along with the RenderView automatically.  This is why we just store
+  // weak references.
 
   // 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 intents dispatcher attached to this view. Not lazily initialized.
   IntentsDispatcher* intents_dispatcher_;
 
@@ skipping 25 matching lines @@
   // The current directory enumeration callback
   std::map<int, WebKit::WebFileChooserCompletion*> enumeration_completions_;
   int enumeration_completion_id_;
 
   // The SessionStorage namespace that we're assigned to has an ID, and that ID
   // is passed to us upon creation.  WebKit asks for this ID upon first use and
   // uses it whenever asking the browser process to allocate new storage areas.
   int64 session_storage_namespace_id_;
 
   // The total number of unrequested popups that exist and can be followed back
-  // to a common opener. This count is shared among all RenderViews created
-  // with createView(). All popups are treated as unrequested until
-  // specifically instructed otherwise by the Browser process.
+  // to a common opener. This count is shared among all RenderViews created with
+  // createView(). All popups are treated as unrequested until specifically
+  // instructed otherwise by the Browser process.
   scoped_refptr<SharedRenderViewCounter> shared_popup_counter_;
 
   // Whether this is a top level window (instead of a popup). Top level windows
   // shouldn't count against their own |shared_popup_counter_|.
   bool decrement_shared_popup_at_destruction_;
 
   // If the browser hasn't sent us an ACK for the last FindReply we sent
   // to it, then we need to queue up the message (keeping only the most
   // recent message if new ones come in).
   scoped_ptr<IPC::Message> queued_find_reply_message_;
@@ skipping 20 matching lines @@
   ObserverList<content::RenderViewObserver> observers_;
 
   // Used to inform didChangeSelection() when it is called in the context
   // of handling a ViewMsg_SelectRange IPC.
   bool handling_select_range_;
 
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a
   // 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
+  // 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);
+  DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
-#endif  // CONTENT_RENDERER_RENDER_VIEW_H_
+#endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_