summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 01:49:55 +0000
committerrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 01:49:55 +0000
commit71a3d2e01be15bc21f792a94cc1c5cd4d272127d (patch)
treed3422cc3ec21eee15464a5acf592138616d18674 /webkit/support
parent09ac4c430545ffd7b8d35bc857b9c27cfaf75cee (diff)
downloadchromium_src-71a3d2e01be15bc21f792a94cc1c5cd4d272127d.zip
chromium_src-71a3d2e01be15bc21f792a94cc1c5cd4d272127d.tar.gz
chromium_src-71a3d2e01be15bc21f792a94cc1c5cd4d272127d.tar.bz2
Move incorrectly placed #endif in webkit_support.cc
(DevTools functions should not be Windows-specific) Review URL: http://codereview.chromium.org/2817029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 1c49ce9..77237cc 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -371,6 +371,8 @@ WebKit::WebThemeEngine* GetThemeEngine() {
return test_environment->theme_engine();
}
+#endif
+
// DevTools
WebCString GetDevToolsInjectedScriptSource() {
base::StringPiece injectJSWebkit = webkit_glue::GetDataResource(
@@ -397,9 +399,7 @@ WebURL GetDevToolsPathAsURL() {
return WebURL();
}
FilePath devToolsPath = dirExe.AppendASCII("resources/inspector/devtools.html");
- return GURL(devToolsPath.value());
+ return net::FilePathToFileURL(devToolsPath);
}
-#endif
-
} // namespace webkit_support