diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-30 01:27:29 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-30 01:27:29 +0000 |
commit | 0e6860191f3dd4b4bf00ef71336b72c63d319180 (patch) | |
tree | 28ec9b21e5152e2602b6d808d42c9414b7027efa /chrome | |
parent | 0b3b9bccd669b11b9e05e83ba5bbe05d1c8e8900 (diff) | |
download | chromium_src-0e6860191f3dd4b4bf00ef71336b72c63d319180.zip chromium_src-0e6860191f3dd4b4bf00ef71336b72c63d319180.tar.gz chromium_src-0e6860191f3dd4b4bf00ef71336b72c63d319180.tar.bz2 |
Add a stub IsPluginProcess so there are less #if defined(OS_WIN) in the code.
Review URL: http://codereview.chromium.org/19692
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/common/common_glue.cc | 6 | ||||
-rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 7 | ||||
-rw-r--r-- | chrome/renderer/renderer_glue.cc | 15 |
3 files changed, 6 insertions, 22 deletions
diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc index 0e173f80..7d957d9 100644 --- a/chrome/common/common_glue.cc +++ b/chrome/common/common_glue.cc @@ -23,13 +23,7 @@ bool GetApplicationDirectory(std::wstring *path) { } bool IsPluginRunningInRendererProcess() { -#if defined(OS_WIN) return !IsPluginProcess(); -#else - // TODO(port): We need an implementation of IsPluginProcess. - NOTIMPLEMENTED(); - return false; -#endif } std::wstring GetWebKitLocale() { diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index acb7298..735a48e7 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -232,9 +232,14 @@ bool RLZTracker::RecordProductEvent(Product product, AccessPoint point, return false; } +// This depends on porting all the plugin IPC messages. +bool IsPluginProcess() { + return false; +} + #if defined(OS_MACOSX) // We link this in for now to avoid hauling in all of WebCore (which we will -// have to eventually do) +// have to eventually do). namespace webkit_glue { std::string GetUserAgent(const GURL& url) { return ""; diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 3bd9edf..a1f03b0 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -164,13 +164,8 @@ void AppendToLog(const char* file, int line, const char* msg) { bool GetMimeTypeFromExtension(const std::wstring &ext, std::string *mime_type) { -#if defined(OS_WIN) - // TODO(port): Need to define IsPluginProcess. if (IsPluginProcess()) return net::GetMimeTypeFromExtension(ext, mime_type); -#else - NOTIMPLEMENTED(); -#endif // The sandbox restricts our access to the registry, so we need to proxy // these calls over to the browser process. @@ -182,13 +177,8 @@ bool GetMimeTypeFromExtension(const std::wstring &ext, bool GetMimeTypeFromFile(const std::wstring &file_path, std::string *mime_type) { -#if defined(OS_WIN) - // TODO(port): Need to define IsPluginProcess. if (IsPluginProcess()) return net::GetMimeTypeFromFile(file_path, mime_type); -#else - NOTIMPLEMENTED(); -#endif // The sandbox restricts our access to the registry, so we need to proxy // these calls over to the browser process. @@ -200,13 +190,8 @@ bool GetMimeTypeFromFile(const std::wstring &file_path, bool GetPreferredExtensionForMimeType(const std::string& mime_type, std::wstring* ext) { -#if defined(OS_WIN) - // TODO(port): Need to define IsPluginProcess. if (IsPluginProcess()) return net::GetPreferredExtensionForMimeType(mime_type, ext); -#else - NOTIMPLEMENTED(); -#endif // The sandbox restricts our access to the registry, so we need to proxy // these calls over to the browser process. |