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

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

Issue 10388146: Fix crash in Android content_shell startup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | content/shell/android/shell_library_loader.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 "base/allocator/allocator_extension.h" 7 #include "base/allocator/allocator_extension.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 signal(SIGINT, SIG_IGN); 481 signal(SIGINT, SIG_IGN);
482 } 482 }
483 #endif 483 #endif
484 484
485 #if defined(USE_NSS) 485 #if defined(USE_NSS)
486 crypto::EarlySetupForNSSInit(); 486 crypto::EarlySetupForNSSInit();
487 #endif 487 #endif
488 488
489 ui::RegisterPathProvider(); 489 ui::RegisterPathProvider();
490 content::RegisterPathProvider(); 490 content::RegisterPathProvider();
491
492 // TODO(jrg): "up to here" is how far we get without crashing on
493 // content shell bringup.
494 #if defined(ANDROID_UPSTREAM_BRINGUP)
495 return 0;
496 #endif
497 content::RegisterContentSchemes(true); 491 content::RegisterContentSchemes(true);
498 492
499 CHECK(icu_util::Initialize()); 493 CHECK(icu_util::Initialize());
500 494
501 base::ProcessId browser_pid = base::GetCurrentProcId(); 495 base::ProcessId browser_pid = base::GetCurrentProcId();
502 if (command_line.HasSwitch(switches::kProcessChannelID)) { 496 if (command_line.HasSwitch(switches::kProcessChannelID)) {
503 #if defined(OS_WIN) || defined(OS_MACOSX) 497 #if defined(OS_WIN) || defined(OS_MACOSX)
504 std::string channel_name = 498 std::string channel_name =
505 command_line.GetSwitchValueASCII(switches::kProcessChannelID); 499 command_line.GetSwitchValueASCII(switches::kProcessChannelID);
506 500
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 } // namespace 621 } // namespace
628 622
629 namespace content { 623 namespace content {
630 624
631 // static 625 // static
632 ContentMainRunner* ContentMainRunner::Create() { 626 ContentMainRunner* ContentMainRunner::Create() {
633 return new ContentMainRunnerImpl(); 627 return new ContentMainRunnerImpl();
634 } 628 }
635 629
636 } // namespace content 630 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/shell/android/shell_library_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698