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

Side by Side Diff: content/app/content_main_runner.cc

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: Created 5 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/public/app/content_main_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include "base/allocator/allocator_extension.h" 9 #include "base/allocator/allocator_extension.h"
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 { switches::kRendererProcess, RendererMain }, 273 { switches::kRendererProcess, RendererMain },
274 #if defined(ENABLE_PLUGINS) 274 #if defined(ENABLE_PLUGINS)
275 { switches::kPpapiPluginProcess, PpapiPluginMain }, 275 { switches::kPpapiPluginProcess, PpapiPluginMain },
276 #endif 276 #endif
277 { switches::kUtilityProcess, UtilityMain }, 277 { switches::kUtilityProcess, UtilityMain },
278 }; 278 };
279 279
280 ScopedVector<ZygoteForkDelegate> zygote_fork_delegates; 280 ScopedVector<ZygoteForkDelegate> zygote_fork_delegates;
281 if (delegate) { 281 if (delegate) {
282 delegate->ZygoteStarting(&zygote_fork_delegates); 282 delegate->ZygoteStarting(&zygote_fork_delegates);
283 // Each Renderer we spawn will re-attempt initialization of the media 283 media::InitializeMediaLibrary();
284 // libraries, at which point failure will be detected and handled, so
285 // we do not need to cope with initialization failures here.
286 base::FilePath media_path;
287 if (PathService::Get(DIR_MEDIA_LIBS, &media_path))
288 media::InitializeMediaLibrary(media_path);
289 } 284 }
290 285
291 // This function call can return multiple times, once per fork(). 286 // This function call can return multiple times, once per fork().
292 if (!ZygoteMain(main_function_params, zygote_fork_delegates.Pass())) 287 if (!ZygoteMain(main_function_params, zygote_fork_delegates.Pass()))
293 return 1; 288 return 1;
294 289
295 if (delegate) delegate->ZygoteForked(); 290 if (delegate) delegate->ZygoteForked();
296 291
297 // Zygote::HandleForkRequest may have reallocated the command 292 // Zygote::HandleForkRequest may have reallocated the command
298 // line so update it here with the new version. 293 // line so update it here with the new version.
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 842
848 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 843 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
849 }; 844 };
850 845
851 // static 846 // static
852 ContentMainRunner* ContentMainRunner::Create() { 847 ContentMainRunner* ContentMainRunner::Create() {
853 return new ContentMainRunnerImpl(); 848 return new ContentMainRunnerImpl();
854 } 849 }
855 850
856 } // namespace content 851 } // namespace content
OLDNEW
« no previous file with comments | « components/html_viewer/web_media_player_factory.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698