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

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

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. 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
« no previous file with comments | « components/html_viewer/media_factory.cc ('k') | content/browser/browser_main_loop.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) 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 { switches::kRendererProcess, RendererMain }, 275 { switches::kRendererProcess, RendererMain },
276 #if defined(ENABLE_PLUGINS) 276 #if defined(ENABLE_PLUGINS)
277 { switches::kPpapiPluginProcess, PpapiPluginMain }, 277 { switches::kPpapiPluginProcess, PpapiPluginMain },
278 #endif 278 #endif
279 { switches::kUtilityProcess, UtilityMain }, 279 { switches::kUtilityProcess, UtilityMain },
280 }; 280 };
281 281
282 ScopedVector<ZygoteForkDelegate> zygote_fork_delegates; 282 ScopedVector<ZygoteForkDelegate> zygote_fork_delegates;
283 if (delegate) { 283 if (delegate) {
284 delegate->ZygoteStarting(&zygote_fork_delegates); 284 delegate->ZygoteStarting(&zygote_fork_delegates);
285 // Each Renderer we spawn will re-attempt initialization of the media 285 media::InitializeMediaLibrary();
286 // libraries, at which point failure will be detected and handled, so
287 // we do not need to cope with initialization failures here.
288 base::FilePath media_path;
289 if (PathService::Get(DIR_MEDIA_LIBS, &media_path))
290 media::InitializeMediaLibrary(media_path);
291 } 286 }
292 287
293 // This function call can return multiple times, once per fork(). 288 // This function call can return multiple times, once per fork().
294 if (!ZygoteMain(main_function_params, zygote_fork_delegates.Pass())) 289 if (!ZygoteMain(main_function_params, zygote_fork_delegates.Pass()))
295 return 1; 290 return 1;
296 291
297 if (delegate) delegate->ZygoteForked(); 292 if (delegate) delegate->ZygoteForked();
298 293
299 // Zygote::HandleForkRequest may have reallocated the command 294 // Zygote::HandleForkRequest may have reallocated the command
300 // line so update it here with the new version. 295 // line so update it here with the new version.
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 861
867 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 862 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
868 }; 863 };
869 864
870 // static 865 // static
871 ContentMainRunner* ContentMainRunner::Create() { 866 ContentMainRunner* ContentMainRunner::Create() {
872 return new ContentMainRunnerImpl(); 867 return new ContentMainRunnerImpl();
873 } 868 }
874 869
875 } // namespace content 870 } // namespace content
OLDNEW
« no previous file with comments | « components/html_viewer/media_factory.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698