Revert "Implement WebFrameClient in RenderFrame and proxy all calls to RenderView (for now)." (r207…

content/renderer/render_view_impl.h

 // Copyright (c) 2012 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_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 591 matching lines @@
                                       const char* data, size_t length,
                                       bool& prevent_default);
   virtual void didCommitProvisionalLoad(WebKit::WebFrame* frame,
                                         bool is_new_navigation);
   virtual void didClearWindowObject(WebKit::WebFrame* frame);
   virtual void didCreateDocumentElement(WebKit::WebFrame* frame);
   virtual void didReceiveTitle(WebKit::WebFrame* frame,
                                const WebKit::WebString& title,
                                WebKit::WebTextDirection direction);
   virtual void didChangeIcon(WebKit::WebFrame*,
-                             WebKit::WebIconURL::Type);
+                             WebKit::WebIconURL::Type) OVERRIDE;
   virtual void didFinishDocumentLoad(WebKit::WebFrame* frame);
   virtual void didHandleOnloadEvents(WebKit::WebFrame* frame);
   virtual void didFailLoad(WebKit::WebFrame* frame,
                            const WebKit::WebURLError& error);
   virtual void didFinishLoad(WebKit::WebFrame* frame);
   virtual void didNavigateWithinPage(WebKit::WebFrame* frame,
                                      bool is_new_navigation);
   virtual void didUpdateCurrentHistoryItem(WebKit::WebFrame* frame);
   virtual void assignIdentifierToRequest(WebKit::WebFrame* frame,
                                          unsigned identifier,
@@ skipping 21 matching lines @@
       const WebKit::WebURL& target);
   virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame);
   virtual void didCreateScriptContext(WebKit::WebFrame* frame,
                                       v8::Handle<v8::Context>,
                                       int extension_group,
                                       int world_id);
   virtual void willReleaseScriptContext(WebKit::WebFrame* frame,
                                         v8::Handle<v8::Context>,
                                         int world_id);
   virtual void didChangeScrollOffset(WebKit::WebFrame* frame);
-  virtual void willInsertBody(WebKit::WebFrame* frame);
-  virtual void didFirstVisuallyNonEmptyLayout(WebKit::WebFrame*);
+  virtual void willInsertBody(WebKit::WebFrame* frame) OVERRIDE;
+  virtual void didFirstVisuallyNonEmptyLayout(WebKit::WebFrame*) OVERRIDE;
   virtual void didChangeContentsSize(WebKit::WebFrame* frame,
                                      const WebKit::WebSize& size);
   virtual void reportFindInPageMatchCount(int request_id,
                                           int count,
                                           bool final_update);
   virtual void reportFindInPageSelection(int request_id,
                                          int active_match_ordinal,
                                          const WebKit::WebRect& sel);
   virtual void openFileSystem(WebKit::WebFrame* frame,
                               WebKit::WebFileSystemType type,
                               long long size,
                               bool create,
                               WebKit::WebFileSystemCallbacks* callbacks);
   virtual void deleteFileSystem(WebKit::WebFrame* frame,
                                 WebKit::WebFileSystemType type,
                                 WebKit::WebFileSystemCallbacks* callbacks);
   virtual void queryStorageUsageAndQuota(
       WebKit::WebFrame* frame,
       WebKit::WebStorageQuotaType type,
       WebKit::WebStorageQuotaCallbacks* callbacks);
   virtual void requestStorageQuota(
       WebKit::WebFrame* frame,
       WebKit::WebStorageQuotaType type,
       unsigned long long requested_size,
       WebKit::WebStorageQuotaCallbacks* callbacks);
   virtual void willOpenSocketStream(
       WebKit::WebSocketStreamHandle* handle);
   virtual void willStartUsingPeerConnectionHandler(WebKit::WebFrame* frame,
-      WebKit::WebRTCPeerConnectionHandler* handler);
+      WebKit::WebRTCPeerConnectionHandler* handler) OVERRIDE;
   virtual bool willCheckAndDispatchMessageEvent(
       WebKit::WebFrame* sourceFrame,
       WebKit::WebFrame* targetFrame,
       WebKit::WebSecurityOrigin targetOrigin,
-      WebKit::WebDOMMessageEvent event);
+      WebKit::WebDOMMessageEvent event) OVERRIDE;
   virtual WebKit::WebString acceptLanguages() OVERRIDE;
   virtual WebKit::WebString userAgentOverride(
       WebKit::WebFrame* frame,
-      const WebKit::WebURL& url);
-  virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame);
-  virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value);
+      const WebKit::WebURL& url) OVERRIDE;
+  virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame) OVERRIDE;
+  virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value) OVERRIDE;
   virtual void didLoseWebGLContext(
       WebKit::WebFrame* frame,
-      int arb_robustness_status_code);
+      int arb_robustness_status_code) OVERRIDE;
 
   // WebKit::WebPageSerializerClient implementation ----------------------------
 
   virtual void didSerializeDataForFrame(
       const WebKit::WebURL& frame_url,
       const WebKit::WebCString& data,
       PageSerializationStatus status) OVERRIDE;
 
   // RenderView implementation -------------------------------------------------
 
@@ skipping 864 matching lines @@
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_