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

Side by Side Diff: chrome/renderer/render_process.cc

Issue 115482: Move WebMediaPlayerClientImpl files to WebKit API src location.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/render_process.h ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <objidl.h> 9 #include <objidl.h>
10 #include <mlang.h> 10 #include <mlang.h>
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 if (command_line.HasSwitch(switches::kEnableWatchdog)) { 106 if (command_line.HasSwitch(switches::kEnableWatchdog)) {
107 // TODO(JAR): Need to implement renderer IO msgloop watchdog. 107 // TODO(JAR): Need to implement renderer IO msgloop watchdog.
108 } 108 }
109 109
110 if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) { 110 if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) {
111 StatisticsRecorder::set_dump_on_exit(true); 111 StatisticsRecorder::set_dump_on_exit(true);
112 } 112 }
113 113
114 FilePath module_path; 114 FilePath module_path;
115 if (PathService::Get(base::DIR_MODULE, &module_path)) { 115 initialized_media_library_ =
116 if (media::InitializeMediaLibrary(module_path)) { 116 PathService::Get(base::DIR_MODULE, &module_path) &&
117 webkit_glue::SetMediaPlayerAvailable(true); 117 media::InitializeMediaLibrary(module_path);
118 }
119 }
120 } 118 }
121 119
122 bool RenderProcess::InProcessPlugins() { 120 bool RenderProcess::InProcessPlugins() {
123 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 121 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
124 #if defined(OS_LINUX) 122 #if defined(OS_LINUX)
125 // Plugin processes require a UI message loop, and the Linux message loop 123 // Plugin processes require a UI message loop, and the Linux message loop
126 // implementation only allows one UI loop per process. 124 // implementation only allows one UI loop per process.
127 if (command_line.HasSwitch(switches::kInProcessPlugins)) 125 if (command_line.HasSwitch(switches::kInProcessPlugins))
128 NOTIMPLEMENTED() << ": in process plugins not supported on Linux"; 126 NOTIMPLEMENTED() << ": in process plugins not supported on Linux";
129 return command_line.HasSwitch(switches::kInProcessPlugins); 127 return command_line.HasSwitch(switches::kInProcessPlugins);
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 } 259 }
262 260
263 void RenderProcess::ClearTransportDIBCache() { 261 void RenderProcess::ClearTransportDIBCache() {
264 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) { 262 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) {
265 if (shared_mem_cache_[i]) { 263 if (shared_mem_cache_[i]) {
266 FreeTransportDIB(shared_mem_cache_[i]); 264 FreeTransportDIB(shared_mem_cache_[i]);
267 shared_mem_cache_[i] = NULL; 265 shared_mem_cache_[i] = NULL;
268 } 266 }
269 } 267 }
270 } 268 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_process.h ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698