summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell.h
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 16:30:07 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 16:30:07 +0000
commita2c04149d7404cb361e588417e38c82008298e92 (patch)
tree4ec05299f22544e6948f0f407b96b2512aa7f31f /webkit/tools/test_shell/test_shell.h
parentd5a276e97343c5a85c48bbbc9d1218ef943f6707 (diff)
downloadchromium_src-a2c04149d7404cb361e588417e38c82008298e92.zip
chromium_src-a2c04149d7404cb361e588417e38c82008298e92.tar.gz
chromium_src-a2c04149d7404cb361e588417e38c82008298e92.tar.bz2
Revert 50726 "DevTools: Migrate to new WebView initialization (pass devtools client directly)."
Review URL: http://codereview.chromium.org/2871023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.h')
-rw-r--r--[-rwxr-xr-x]webkit/tools/test_shell/test_shell.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index f415d54..21d8856 100755..100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -92,7 +92,7 @@ public:
static void CleanupLogging();
// Initialization and clean up of a static member variable.
- static void InitializeTestShell(bool layout_test_mode,
+ static void InitializeTestShell(bool layout_test_mode,
bool allow_external_pages);
static void ShutdownTestShell();
@@ -329,6 +329,7 @@ public:
protected:
void CreateDevToolsClient(TestShellDevToolsAgent* agent);
bool Initialize(const GURL& starting_url);
+ void InitializeDevToolsAgent(WebKit::WebView* webView);
bool IsSVGTestURL(const GURL& url);
void SizeToSVG();
void SizeToDefault();
@@ -385,9 +386,9 @@ private:
// True when the app is being run using the --layout-tests switch.
static bool layout_test_mode_;
-
+
// True when we wish to allow test shell to load external pages like
- // www.google.com even when in --layout-test mode (used for QA to
+ // www.google.com even when in --layout-test mode (used for QA to
// produce images of the rendered page)
static bool allow_external_pages_;