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 906923003: Fix fonts not loading in PDFs that don't embed them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | chrome/child/pdf_child_init.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/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 ui::ResourceBundle::InitSharedInstanceWithLocale( 769 ui::ResourceBundle::InitSharedInstanceWithLocale(
770 locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); 770 locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
771 771
772 base::FilePath resources_pack_path; 772 base::FilePath resources_pack_path;
773 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); 773 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
774 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 774 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
775 resources_pack_path, ui::SCALE_FACTOR_NONE); 775 resources_pack_path, ui::SCALE_FACTOR_NONE);
776 #endif 776 #endif
777 CHECK(!loaded_locale.empty()) << "Locale could not be found for " << 777 CHECK(!loaded_locale.empty()) << "Locale could not be found for " <<
778 locale; 778 locale;
779 }
779 780
780 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 781 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
781 if (process_type == switches::kUtilityProcess || 782 if (process_type == switches::kUtilityProcess ||
782 process_type == switches::kZygoteProcess) { 783 process_type == switches::kZygoteProcess) {
783 ChromeContentUtilityClient::PreSandboxStartup(); 784 ChromeContentUtilityClient::PreSandboxStartup();
784 } 785 }
785 786
786 chrome::InitializePDF(); 787 chrome::InitializePDF();
787 #endif 788 #endif
788 }
789 789
790 #if defined(OS_POSIX) && !defined(OS_MACOSX) 790 #if defined(OS_POSIX) && !defined(OS_MACOSX)
791 // Zygote needs to call InitCrashReporter() in RunZygote(). 791 // Zygote needs to call InitCrashReporter() in RunZygote().
792 if (process_type != switches::kZygoteProcess) { 792 if (process_type != switches::kZygoteProcess) {
793 #if defined(OS_ANDROID) 793 #if defined(OS_ANDROID)
794 if (process_type.empty()) 794 if (process_type.empty())
795 breakpad::InitCrashReporter(process_type); 795 breakpad::InitCrashReporter(process_type);
796 else 796 else
797 breakpad::InitNonBrowserCrashReporterForAndroid(process_type); 797 breakpad::InitNonBrowserCrashReporterForAndroid(process_type);
798 #else // !defined(OS_ANDROID) 798 #else // !defined(OS_ANDROID)
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 } 978 }
979 979
980 content::ContentUtilityClient* 980 content::ContentUtilityClient*
981 ChromeMainDelegate::CreateContentUtilityClient() { 981 ChromeMainDelegate::CreateContentUtilityClient() {
982 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 982 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
983 return NULL; 983 return NULL;
984 #else 984 #else
985 return g_chrome_content_utility_client.Pointer(); 985 return g_chrome_content_utility_client.Pointer();
986 #endif 986 #endif
987 } 987 }
OLDNEW
« no previous file with comments | « no previous file | chrome/child/pdf_child_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698