Add option --dump-render-tree to content_shell to dump the render tree as text.

BUG=111316
TEST=run out/Debug/content_shell --dump-render-tree file://$(pwd)/third_party/WebKit/LayoutTests/fast/html/section-element.html > section-element-actual.txt - should be the same as section-element-expected.txt


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

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

1 files changed, 9 insertions, 2 deletions

diff --git a/content/shell/shell.h b/content/shell/shell.h
index c4b09f7..bae8ef2 100644
--- a/content/shell/shell.h
+++ b/content/shell/shell.h
@@ -13,6 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_LINUX)
@@ -31,7 +32,8 @@ class SiteInstance;
 
 // This represents one window of the Content Shell, i.e. all the UI including
 // buttons and url bar, as well as the web content area.
-class Shell : public WebContentsDelegate {
+class Shell : public WebContentsDelegate,
+              public WebContentsObserver {
  public:
   virtual ~Shell();
 
@@ -71,7 +73,7 @@ class Shell : public WebContentsDelegate {
     STOP_BUTTON
   };
 
-  Shell();
+  explicit Shell(TabContents* tab_contents);
 
   // Helper to create a new Shell given a newly created TabContents.
   static Shell* CreateShell(TabContents* tab_contents);
@@ -107,6 +109,11 @@ class Shell : public WebContentsDelegate {
   virtual void UpdatePreferredSize(WebContents* source,
                                    const gfx::Size& pref_size) OVERRIDE;
 
+  // content::WebContentsObserver
+  virtual void DidFinishLoad(int64 frame_id,
+                             const GURL& validated_url,
+                             bool is_main_frame) OVERRIDE;
+
 #if defined(OS_WIN)
   static ATOM RegisterWindowClass();
   static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);