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

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

Issue 317833006: [ICU] Avoid reading ICU data files in render process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
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 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 } 695 }
696 #endif 696 #endif
697 697
698 #if defined(USE_NSS) 698 #if defined(USE_NSS)
699 crypto::EarlySetupForNSSInit(); 699 crypto::EarlySetupForNSSInit();
700 #endif 700 #endif
701 701
702 ui::RegisterPathProvider(); 702 ui::RegisterPathProvider();
703 RegisterPathProvider(); 703 RegisterPathProvider();
704 RegisterContentSchemes(true); 704 RegisterContentSchemes(true);
705 705 #if defined(OS_ANDROID)
706 // If delegate_ exists, ICU is initialized in delegate_->PreSandboxStartup()
707 if (!delegate_)
708 CHECK(base::i18n::InitializeICU());
709 #else
706 CHECK(base::i18n::InitializeICU()); 710 CHECK(base::i18n::InitializeICU());
711 #endif
707 712
708 InitializeStatsTable(command_line); 713 InitializeStatsTable(command_line);
709 714
710 if (delegate_) 715 if (delegate_)
711 delegate_->PreSandboxStartup(); 716 delegate_->PreSandboxStartup();
712 717
713 if (!process_type.empty()) 718 if (!process_type.empty())
714 CommonSubprocessInit(process_type); 719 CommonSubprocessInit(process_type);
715 720
716 #if defined(OS_WIN) 721 #if defined(OS_WIN)
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 821
817 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 822 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
818 }; 823 };
819 824
820 // static 825 // static
821 ContentMainRunner* ContentMainRunner::Create() { 826 ContentMainRunner* ContentMainRunner::Create() {
822 return new ContentMainRunnerImpl(); 827 return new ContentMainRunnerImpl();
823 } 828 }
824 829
825 } // namespace content 830 } // namespace content
OLDNEW
« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/common/descriptors_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698