OLD | NEW |
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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
709 #endif | 709 #endif |
710 | 710 |
711 #if defined(USE_NSS) | 711 #if defined(USE_NSS) |
712 crypto::EarlySetupForNSSInit(); | 712 crypto::EarlySetupForNSSInit(); |
713 #endif | 713 #endif |
714 | 714 |
715 ui::RegisterPathProvider(); | 715 ui::RegisterPathProvider(); |
716 RegisterPathProvider(); | 716 RegisterPathProvider(); |
717 RegisterContentSchemes(true); | 717 RegisterContentSchemes(true); |
718 | 718 |
719 CHECK(icu_util::Initialize()); | 719 CHECK(base::i18n::InitializeICU()); |
720 | 720 |
721 InitializeStatsTable(command_line); | 721 InitializeStatsTable(command_line); |
722 | 722 |
723 if (delegate) | 723 if (delegate) |
724 delegate->PreSandboxStartup(); | 724 delegate->PreSandboxStartup(); |
725 | 725 |
726 // Set any custom user agent passed on the command line now so the string | 726 // Set any custom user agent passed on the command line now so the string |
727 // doesn't change between calls to webkit_glue::GetUserAgent(), otherwise it | 727 // doesn't change between calls to webkit_glue::GetUserAgent(), otherwise it |
728 // defaults to the user agent set during SetContentClient(). | 728 // defaults to the user agent set during SetContentClient(). |
729 if (command_line.HasSwitch(switches::kUserAgent)) { | 729 if (command_line.HasSwitch(switches::kUserAgent)) { |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
834 | 834 |
835 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 835 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
836 }; | 836 }; |
837 | 837 |
838 // static | 838 // static |
839 ContentMainRunner* ContentMainRunner::Create() { | 839 ContentMainRunner* ContentMainRunner::Create() { |
840 return new ContentMainRunnerImpl(); | 840 return new ContentMainRunnerImpl(); |
841 } | 841 } |
842 | 842 |
843 } // namespace content | 843 } // namespace content |
OLD | NEW |