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

Unified Diff: chrome/service/service_process.cc

Issue 6537022: Move media library path resolution into Chrome path provider. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Get rid of spurious changes in previous patch-set. Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/service/service_process.h ('k') | content/browser/zygote_main_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/service_process.cc
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
index 13359363c41a9ed7f47ab9f50e05b57b301f7fec..d559c46869b28738c2a4dfa07ac85e0d96c3859b 100644
--- a/chrome/service/service_process.cc
+++ b/chrome/service/service_process.cc
@@ -175,23 +175,14 @@ bool ServiceProcess::Initialize(MessageLoopForUI* message_loop,
#if defined(ENABLE_REMOTING)
// Load media codecs, required by the Chromoting host
- bool initialized_media_library = false;
-#if defined(OS_MACOSX)
- FilePath bundle_path = base::mac::MainAppBundlePath();
-
- initialized_media_library =
- media::InitializeMediaLibrary(bundle_path.Append("Libraries"));
-#else
FilePath module_path;
- initialized_media_library =
- PathService::Get(base::DIR_MODULE, &module_path) &&
- media::InitializeMediaLibrary(module_path);
-#endif
-
- // Initialize chromoting host manager.
- remoting_host_manager_ = new remoting::ChromotingHostManager(this);
- remoting_host_manager_->Initialize(message_loop,
- file_thread_->message_loop_proxy());
+ if (PathService::Get(chrome::DIR_MEDIA_LIBS, &module_path) &&
+ media::InitializeMediaLibrary(module_path)) {
+ // Initialize chromoting host manager.
+ remoting_host_manager_ = new remoting::ChromotingHostManager(this);
+ remoting_host_manager_->Initialize(message_loop,
+ file_thread_->message_loop_proxy());
+ }
#endif // ENABLE_REMOTING
// Enable Cloud Print if needed. First check the command-line.
@@ -359,7 +350,3 @@ ServiceProcess::~ServiceProcess() {
Teardown();
g_service_process = NULL;
}
-
-// Disable refcounting for runnable method because it is really not needed
-// when we post tasks on the main message loop.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);
« no previous file with comments | « chrome/service/service_process.h ('k') | content/browser/zygote_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698