Correct the order of the methods in webframe_impl.cc to match how they are

declared in webframe_impl.h.  The methods were quite jumbled up making it
hard to know where to add new methods and making the code harder to read.

This patch only involved shifting methods around in the files.  There are
not substantive changes in this CL.

R=dglazkov
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/164244

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22922 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 19 deletions

diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 0749a61..db30142 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -64,16 +64,6 @@ struct WindowFeatures;
 class WebFrameImpl : public WebKit::WebFrame,
                      public base::RefCounted<WebFrameImpl> {
  public:
-  WebFrameImpl();
-  ~WebFrameImpl();
-
-  static int live_object_count() {
-    return live_object_count_;
-  }
-
-  // Called by the WebViewImpl to initialize its main frame:
-  void InitMainFrame(WebViewImpl* webview_impl);
-
   // WebFrame methods:
   virtual WebKit::WebString name() const;
   virtual WebKit::WebURL url() const;
@@ -175,11 +165,20 @@ class WebFrameImpl : public WebKit::WebFrame,
   virtual WebKit::WebString contentAsText(size_t max_chars) const;
   virtual WebKit::WebString contentAsMarkup() const;
 
+  WebFrameImpl();
+  ~WebFrameImpl();
+
+  static int live_object_count() {
+    return live_object_count_;
+  }
+
+  // Called by the WebViewImpl to initialize its main frame:
+  void InitMainFrame(WebViewImpl* webview_impl);
+
   PassRefPtr<WebCore::Frame> CreateChildFrame(
       const WebCore::FrameLoadRequest&,
       WebCore::HTMLFrameOwnerElement* owner_element);
 
-  // WebFrameImpl
   void Layout();
   void Paint(skia::PlatformCanvas* canvas, const WebKit::WebRect& rect);
 
@@ -352,9 +351,6 @@ class WebFrameImpl : public WebKit::WebFrame,
   // was searched.
   bool ShouldScopeMatches(const string16& search_text);
 
-  // Only for test_shell
-  int PendingFrameUnloadEventCount() const;
-
   // Determines whether to invalidate the content area and scrollbar.
   void InvalidateIfNecessary();
 
@@ -363,11 +359,6 @@ class WebFrameImpl : public WebKit::WebFrame,
 
   void LoadJavaScriptURL(const WebCore::KURL& url);
 
-  // Callback function for download of alternate error pages.  If the server is
-  // down or we take too long to download the page, |html| will be empty.
-  void AltErrorPageFinished(const GURL& unreachable_url,
-                            const std::string& html);
-
   // Valid between calls to BeginPrint() and EndPrint(). Containts the print
   // information. Is used by PrintPage().
   scoped_ptr<ChromePrintContext> print_context_;