Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1031)

Unified Diff: webkit/tools/test_shell/test_shell.h

Issue 2871023: Revert 50726 "DevTools: Migrate to new WebView initialization (pass devtools client directly)." (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.h
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
old mode 100755
new mode 100644
index f415d54c553142bfd5f2ffa79aaddb342f105fce..21d8856a8b484cd62ad1eb5a1a2792e9d3cf03f9
--- 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_;
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698