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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 70083006: Load pdf library on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | chrome/utility/chrome_content_utility_client.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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 689
690 base::FilePath resources_pack_path; 690 base::FilePath resources_pack_path;
691 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); 691 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
692 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 692 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
693 resources_pack_path, ui::SCALE_FACTOR_NONE); 693 resources_pack_path, ui::SCALE_FACTOR_NONE);
694 #endif 694 #endif
695 CHECK(!loaded_locale.empty()) << "Locale could not be found for " << 695 CHECK(!loaded_locale.empty()) << "Locale could not be found for " <<
696 locale; 696 locale;
697 697
698 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 698 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
699 if (process_type == switches::kUtilityProcess) 699 if (process_type == switches::kUtilityProcess ||
700 process_type == switches::kZygoteProcess) {
700 chrome::ChromeContentUtilityClient::PreSandboxStartup(); 701 chrome::ChromeContentUtilityClient::PreSandboxStartup();
jln (very slow on Chromium) 2013/11/14 23:14:18 Do you mind calling this from content/zygote/zygot
Vitaly Buka (NO REVIEWS) 2013/11/14 23:53:18 PreSandboxInit() / PreloadPepperPlugins() are p
jln (very slow on Chromium) 2013/11/15 00:11:22 Ahh yeah, of course, silly me. I hope that the Zy
702 }
701 #endif 703 #endif
702 } 704 }
703 705
704 #if defined(OS_POSIX) && !defined(OS_MACOSX) 706 #if defined(OS_POSIX) && !defined(OS_MACOSX)
705 // Zygote needs to call InitCrashReporter() in RunZygote(). 707 // Zygote needs to call InitCrashReporter() in RunZygote().
706 if (process_type != switches::kZygoteProcess) { 708 if (process_type != switches::kZygoteProcess) {
707 #if defined(OS_ANDROID) 709 #if defined(OS_ANDROID)
708 if (process_type.empty()) 710 if (process_type.empty())
709 breakpad::InitCrashReporter(); 711 breakpad::InitCrashReporter();
710 else 712 else
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 } 853 }
852 854
853 content::ContentUtilityClient* 855 content::ContentUtilityClient*
854 ChromeMainDelegate::CreateContentUtilityClient() { 856 ChromeMainDelegate::CreateContentUtilityClient() {
855 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 857 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
856 return NULL; 858 return NULL;
857 #else 859 #else
858 return &g_chrome_content_utility_client.Get(); 860 return &g_chrome_content_utility_client.Get();
859 #endif 861 #endif
860 } 862 }
OLDNEW
« no previous file with comments | « no previous file | chrome/utility/chrome_content_utility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698