diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 00:49:34 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 00:49:34 +0000 |
commit | f1933791ead4e0c44066287396f0475e95a2e1e3 (patch) | |
tree | b9c6ef28cfdf0ad22d19327f2cdc5463ba4cd782 /content/renderer | |
parent | 5d93738d664767ee0c7d3f0de8e5f68100de0b54 (diff) | |
download | chromium_src-f1933791ead4e0c44066287396f0475e95a2e1e3.zip chromium_src-f1933791ead4e0c44066287396f0475e95a2e1e3.tar.gz chromium_src-f1933791ead4e0c44066287396f0475e95a2e1e3.tar.bz2 |
Get rid of the following dependencies from content:
chrome/common/chrome_constants.h
chrome/common/chrome_paths.h
chrome/common/logging_chrome.h
BUG=76697
Review URL: http://codereview.chromium.org/7104144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r-- | content/renderer/content_renderer_client.cc | 4 | ||||
-rw-r--r-- | content/renderer/content_renderer_client.h | 3 | ||||
-rw-r--r-- | content/renderer/render_process.h | 2 | ||||
-rw-r--r-- | content/renderer/render_process_impl.cc | 22 | ||||
-rw-r--r-- | content/renderer/render_process_impl.h | 1 | ||||
-rw-r--r-- | content/renderer/render_thread.cc | 6 |
6 files changed, 0 insertions, 38 deletions
diff --git a/content/renderer/content_renderer_client.cc b/content/renderer/content_renderer_client.cc index ff5822e..db96ca8 100644 --- a/content/renderer/content_renderer_client.cc +++ b/content/renderer/content_renderer_client.cc @@ -65,10 +65,6 @@ bool ContentRendererClient::WillSendRequest(WebFrame* frame, return false; } -FilePath ContentRendererClient::GetMediaLibraryPath() { - return FilePath(); -} - bool ContentRendererClient::ShouldPumpEventsDuringCookieMessage() { return false; } diff --git a/content/renderer/content_renderer_client.h b/content/renderer/content_renderer_client.h index 5c87bc6..3f012c1 100644 --- a/content/renderer/content_renderer_client.h +++ b/content/renderer/content_renderer_client.h @@ -83,9 +83,6 @@ class ContentRendererClient { const GURL& url, GURL* new_url); - // Returns the file path where the media library files are. - virtual FilePath GetMediaLibraryPath(); - // Whether to pump events when sending sync cookie messages. Needed if the // embedder can potentiall put up a modal dialog on the UI thread as a result. virtual bool ShouldPumpEventsDuringCookieMessage(); diff --git a/content/renderer/render_process.h b/content/renderer/render_process.h index 2fb2a61..8ae6611 100644 --- a/content/renderer/render_process.h +++ b/content/renderer/render_process.h @@ -48,8 +48,6 @@ class RenderProcess : public ChildProcess { // Returns true if plugisn should be loaded in-process. virtual bool UseInProcessPlugins() const = 0; - virtual bool HasInitializedMediaLibrary() const = 0; - // Returns a pointer to the RenderProcess singleton instance. Assuming that // we're actually a renderer or a renderer test, this static cast will // be correct. diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index 1ded505..3e67c64 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc @@ -25,8 +25,6 @@ #include "content/renderer/render_view.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message_utils.h" -#include "media/base/media.h" -#include "media/base/media_switches.h" #include "skia/ext/platform_canvas.h" #include "ui/gfx/surface/transport_dib.h" #include "webkit/plugins/npapi/plugin_instance.h" @@ -74,22 +72,6 @@ RenderProcessImpl::RenderProcessImpl() webkit_glue::SetJavaScriptFlags( command_line.GetSwitchValueASCII(switches::kJavaScriptFlags)); } - - // Note that under Linux, the media library will normally already have - // been initialized by the Zygote before this instance became a Renderer. - FilePath media_path = - content::GetContentClient()->renderer()->GetMediaLibraryPath(); - if (!media_path.empty()) - media::InitializeMediaLibrary(media_path); - -#if !defined(OS_MACOSX) - // TODO(hclam): Add more checks here. Currently this is not used. - if (media::IsMediaLibraryInitialized() && - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableOpenMax)) { - media::InitializeOpenMaxLibrary(media_path); - } -#endif } RenderProcessImpl::~RenderProcessImpl() { @@ -195,10 +177,6 @@ bool RenderProcessImpl::UseInProcessPlugins() const { return in_process_plugins_; } -bool RenderProcessImpl::HasInitializedMediaLibrary() const { - return media::IsMediaLibraryInitialized(); -} - bool RenderProcessImpl::GetTransportDIBFromCache(TransportDIB** mem, size_t size) { // look for a cached object that is suitable for the requested size. diff --git a/content/renderer/render_process_impl.h b/content/renderer/render_process_impl.h index c5cbabe..7b74d6f 100644 --- a/content/renderer/render_process_impl.h +++ b/content/renderer/render_process_impl.h @@ -27,7 +27,6 @@ class RenderProcessImpl : public RenderProcess { const gfx::Rect& rect); virtual void ReleaseTransportDIB(TransportDIB* memory); virtual bool UseInProcessPlugins() const; - virtual bool HasInitializedMediaLibrary() const; // Like UseInProcessPlugins(), but called before RenderProcess is created // and does not allow overriding by tests. This just checks the command line diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc index b1eba86..3d9fc8b 100644 --- a/content/renderer/render_thread.cc +++ b/content/renderer/render_thread.cc @@ -569,9 +569,6 @@ void RenderThread::EnsureWebKitInitialized() { web_database_observer_impl_.reset(new WebDatabaseObserverImpl(this)); WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); - WebRuntimeFeatures::enableMediaPlayer( - RenderProcess::current()->HasInitializedMediaLibrary()); - WebRuntimeFeatures::enableSockets( !command_line.HasSwitch(switches::kDisableWebSockets)); @@ -627,9 +624,6 @@ void RenderThread::EnsureWebKitInitialized() { WebRuntimeFeatures::enableQuota(true); - WebRuntimeFeatures::enableSpellCheckAPI( - !command_line.HasSwitch(switches::kDisableSpellcheckAPI)); - FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); } |