Clear RenderThread of any Chrome specific code, and move a bunch of stuff out of RenderView.

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 62 matching lines @@
 class SpeechInputDispatcher;
 class WebPluginDelegatePepper;
 class WebPluginDelegateProxy;
 class WebUIBindings;
 struct ContextMenuMediaParams;
 struct PP_Flash_NetAddress;
 struct ViewHostMsg_RunFileChooser_Params;
 struct ViewMsg_ClosePage_Params;
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_StopFinding_Params;
-struct WebApplicationInfo;
 struct WebDropData;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace chrome {
 class ChromeContentRendererClient;
 }
 
@@ skipping 181 matching lines @@
                            WebKit::WebFileChooserCompletion* completion);
 
   // Sets the content settings that back allowScripts(), allowImages(), and
   // allowPlugins().
   void SetContentSettings(const ContentSettings& settings);
 
   // Notifies the browser that the given action has been performed. This is
   // aggregated to the user metrics service.
   void UserMetricsRecordAction(const std::string& action);
 
-  // Starts installation of the page in the specified frame as a web app. The
-  // page must link to an external 'definition file'. This is different from
-  // the 'application shortcuts' feature where we pull the application
-  // definition out of optional meta tags in the page.
-  bool InstallWebApplicationUsingDefinitionFile(WebKit::WebFrame* frame,
-                                                string16* error);
-
   // Sets whether  the renderer should report load progress to the browser.
   void SetReportLoadProgressEnabled(bool enabled);
 
+  // Gets the focused node. If no such node exists then the node will be isNull.
+  WebKit::WebNode GetFocusedNode() const;
+
+  // Returns true if the parameter node is a textfield, text area or a content
+  // editable div.
+  bool IsEditableNode(const WebKit::WebNode& node);
+
   // Plugin-related functions --------------------------------------------------
   // (See also WebPluginPageDelegate implementation.)
 
   // Notification that the given plugin has crashed.
   void PluginCrashed(const FilePath& plugin_path);
 
   // Notification that the default plugin has done something about a missing
   // plugin. See default_plugin_shared.h for possible values of |status|.
   void OnMissingPluginStatus(WebPluginDelegateProxy* delegate,
                              int status);
@@ skipping 298 matching lines @@
   virtual void DidStartLoadingForPlugin();
   virtual void DidStopLoadingForPlugin();
   virtual WebKit::WebCookieJar* GetCookieJar();
 
   // Please do not add your stuff randomly to the end here. If there is an
   // appropriate section, add it there. If not, there are some random functions
   // nearer to the top you can add it to.
 
   virtual void DidFlushPaint();
 
+  // Cannot use std::set unfortunately since linked_ptr<> does not support
+  // operator<.
+  typedef std::vector<linked_ptr<webkit_glue::ImageResourceFetcher> >
+      ImageResourceFetcherList;
+
  protected:
   // RenderWidget overrides:
   virtual void Close();
   virtual void OnResize(const gfx::Size& new_size,
                         const gfx::Rect& resizer_rect);
   virtual void DidInitiatePaint();
   virtual webkit::ppapi::PluginInstance* GetBitmapForOptimizedPluginPaint(
       const gfx::Rect& paint_bounds,
       TransportDIB** dib,
       gfx::Rect* location,
@@ skipping 26 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnNavStateChanged);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnSetTextDirection);
   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<.
-  typedef std::vector<linked_ptr<webkit_glue::ImageResourceFetcher> >
-      ImageResourceFetcherList;
-
   // Identifies an accessibility notification from webkit.
   struct RendererAccessibilityNotification {
    public:
     bool ShouldIncludeChildren();
 
     // The webkit glue id of the accessibility object.
     int32 id;
 
     // The accessibility notification type.
     WebKit::WebAccessibilityNotification type;
@@ skipping 118 matching lines @@
                             WebKit::WebDragOperationsMask operations_allowed);
   void OnEnablePreferredSizeChangedMode(int flags);
   void OnEnableViewSourceMode();
   void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths);
   void OnExecuteEditCommand(const std::string& name, const std::string& value);
   void OnFileChooserResponse(const std::vector<FilePath>& paths);
   void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&);
   void OnFindReplyAck();
   void OnEnableAccessibility();
   void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
-  void OnGetApplicationInfo(int page_id);
   void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
       const std::vector<GURL>& links,
       const std::vector<FilePath>& local_paths,
       const FilePath& local_directory_name);
   void OnHandleMessageFromExternalHost(const std::string& message,
                                        const std::string& origin,
                                        const std::string& target);
   void OnInstallMissingPlugin();
   void OnDisplayPrerenderedPage();
   void OnMediaPlayerActionAt(const gfx::Point& location,
@@ skipping 93 matching lines @@
   // otherwise it's the empty string.
   void DidBlockContentType(ContentSettingsType settings_type,
                            const std::string& resource_identifier);
 
   // 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);
 
-  // Callback triggered when we finish downloading the application definition
-  // file.
-  void DidDownloadApplicationDefinition(const WebKit::WebURLResponse& response,
-                                        const std::string& data);
-
-  // Callback triggered after each icon referenced by the application definition
-  // is downloaded.
-  void DidDownloadApplicationIcon(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.
   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 std::wstring& frame_xpath) const;
 
-  // Gets the focused node. If no such node exists then the node will be isNull.
-  WebKit::WebNode GetFocusedNode() const;
-
   WebUIBindings* GetWebUIBindings();
 
   ExternalHostBindings* GetExternalHostBindings();
 
   // Should only be called if this object wraps a PluginDocument.
   WebKit::WebPlugin* GetWebPluginFromPluginDocument();
 
   // Decodes a data: URL image or returns an empty image in case of failure.
   SkBitmap ImageFromDataUrl(const GURL&) const;
 
@@ skipping 29 matching lines @@
 #if defined(OS_LINUX)
   void UpdateFontRenderingFromRendererPrefs();
 #else
   void UpdateFontRenderingFromRendererPrefs() {}
 #endif
 
   // Update the target url and tell the browser that the target URL has changed.
   // If |url| is empty, show |fallback_url|.
   void UpdateTargetURL(const GURL& url, const GURL& fallback_url);
 
-  // Updates the state of the toggle spell check command in the browser process.
-  void UpdateToggleSpellCheckCommandState();
-
-  // Helper to add an error message to the root frame's console.
-  void AddErrorToRootConsole(const string16& message);
-
   // ---------------------------------------------------------------------------
   // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
   // it in the same order in the .cc file as it was in the header.
   // ---------------------------------------------------------------------------
 
   // Settings ------------------------------------------------------------------
 
   WebPreferences webkit_preferences_;
   RendererPreferences renderer_preferences_;
 
@@ skipping 230 matching lines @@
   struct PendingFileChooser;
   std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_;
 
   // The current directory enumeration callback
   std::map<int, WebKit::WebFileChooserCompletion*> enumeration_completions_;
   int enumeration_completion_id_;
 
   // ImageResourceFetchers schedule via DownloadImage.
   ImageResourceFetcherList image_fetchers_;
 
-  // The app info that we are processing. This is used when installing an app
-  // via application definition. The in-progress web app is stored here while
-  // its manifest and icons are downloaded.
-  scoped_ptr<WebApplicationInfo> pending_app_info_;
-
-  // Used to download the application definition file.
-  scoped_ptr<webkit_glue::ResourceFetcher> app_definition_fetcher_;
-
-  // Used to download the icons for an application.
-  ImageResourceFetcherList app_icon_fetchers_;
-
-  // The number of app icon requests outstanding. When this reaches zero, we're
-  // done processing an app definition file.
-  int pending_app_icon_requests_;
-
   // 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.
   scoped_refptr<SharedRenderViewCounter> shared_popup_counter_;
@@ skipping 41 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_