summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 17:57:38 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 17:57:38 +0000
commit679d965b4292d028e68591c2d0d2b84e23eed005 (patch)
tree6b23e979cd5a2884564f83c7a1aca3c312f60ba1 /webkit/support
parentd01f431e5e9eb08fbabd807985446c3169d0585d (diff)
downloadchromium_src-679d965b4292d028e68591c2d0d2b84e23eed005.zip
chromium_src-679d965b4292d028e68591c2d0d2b84e23eed005.tar.gz
chromium_src-679d965b4292d028e68591c2d0d2b84e23eed005.tar.bz2
Miscellaneous webkit_glue namespace changes in preparation for building src\content as a dll. This CL
removes the IsDefaultPluginEnabled function in the webkit_glue namespace. This function has been replaced by a flag in the PluginList instance which is set when the default plugin is registered as an internal plugin. The webkit_glue.cc file now implements the GetApplicationDirectory and GetExeDirectory functions in the webkit_glue namespace. Previously these functions were implemented in common_glue.cc and in test_shell. Removed the IsPluginRunningInRendererProcess function from webkit_glue and fixed the callers to not depend on this functionality. BUG=82454 Review URL: http://codereview.chromium.org/6975028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.cc2
-rw-r--r--webkit/support/webkit_support_glue.cc12
2 files changed, 1 insertions, 13 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 8210aaa..ae6f08a 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -566,7 +566,7 @@ WebKit::WebThemeEngine* GetThemeEngine() {
// DevTools
WebURL GetDevToolsPathAsURL() {
FilePath dirExe;
- if (!webkit_glue::GetExeDirectory(&dirExe)) {
+ if (!PathService::Get(base::DIR_EXE, &dirExe)) {
DCHECK(false);
return WebURL();
}
diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc
index 522cfa9..f7bcf50 100644
--- a/webkit/support/webkit_support_glue.cc
+++ b/webkit/support/webkit_support_glue.cc
@@ -38,21 +38,9 @@ bool IsDefaultPluginEnabled() {
return false;
}
-bool IsPluginRunningInRendererProcess() {
- return true;
-}
-
void AppendToLog(const char*, int, const char*) {
}
-bool GetApplicationDirectory(FilePath* path) {
- return PathService::Get(base::DIR_EXE, path);
-}
-
-bool GetExeDirectory(FilePath* path) {
- return GetApplicationDirectory(path);
-}
-
bool IsProtocolSupportedForMedia(const GURL& url) {
if (url.SchemeIsFile() ||
url.SchemeIs("http") ||