Index: content/renderer/render_view.h |
=================================================================== |
--- content/renderer/render_view.h (revision 81801) |
+++ content/renderer/render_view.h (working copy) |
@@ -80,7 +80,6 @@ |
struct ViewMsg_ClosePage_Params; |
struct ViewMsg_Navigate_Params; |
struct ViewMsg_StopFinding_Params; |
-struct WebApplicationInfo; |
struct WebDropData; |
namespace base { |
@@ -282,16 +281,16 @@ |
// 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.) |
@@ -610,6 +609,11 @@ |
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(); |
@@ -656,11 +660,6 @@ |
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: |
@@ -799,7 +798,6 @@ |
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, |
@@ -913,16 +911,6 @@ |
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 |
@@ -938,9 +926,6 @@ |
// 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(); |
@@ -990,12 +975,6 @@ |
// 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. |
@@ -1246,21 +1225,6 @@ |
// 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. |