mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIXME: disable pdf viewer feature

Browse source
This commit is contained in:
deepak1556 2018-03-15 22:57:06 +09:00 committed by Aleksei Kuzmin
parent e24c0dda5d
commit f5e1ee010b
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/common/main_delegate.cc
View file

@ -62,9 +62,11 @@ void LoadResourceBundle(const std::string& locale) {
bundle.AddDataPackFromPath( bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")), pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")),
ui::GetSupportedScaleFactors()[0]); ui::GetSupportedScaleFactors()[0]);
#if defined(ENABLE_PDF_VIEWER)
bundle.AddDataPackFromPath( bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("pdf_viewer_resources.pak")), pak_dir.Append(FILE_PATH_LITERAL("pdf_viewer_resources.pak")),
ui::GetSupportedScaleFactors()[0]); ui::GetSupportedScaleFactors()[0]);
#endif // defined(ENABLE_PDF_VIEWER)
bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL( bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL(
"blink_image_resources_200_percent.pak")), "blink_image_resources_200_percent.pak")),
ui::SCALE_FACTOR_200P); ui::SCALE_FACTOR_200P);

2
brightray/common/main_delegate_mac.mm
View file

@ -36,8 +36,10 @@ void LoadCommonResources() {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
bundle.AddDataPackFromPath(GetResourcesPakFilePath(@"content_shell"), bundle.AddDataPackFromPath(GetResourcesPakFilePath(@"content_shell"),
ui::GetSupportedScaleFactors()[0]); ui::GetSupportedScaleFactors()[0]);
#if defined(ENABLE_PDF_VIEWER)
bundle.AddDataPackFromPath(GetResourcesPakFilePath(@"pdf_viewer_resources"), bundle.AddDataPackFromPath(GetResourcesPakFilePath(@"pdf_viewer_resources"),
ui::GetSupportedScaleFactors()[0]); ui::GetSupportedScaleFactors()[0]);
#endif // defined(ENABLE_PDF_VIEWER)
} }
void MainDelegate::OverrideFrameworkBundlePath() { void MainDelegate::OverrideFrameworkBundlePath() {

2
features.gypi
View file

@ -3,7 +3,7 @@
'variables': { 'variables': {
'variables': { 'variables': {
'enable_osr%': 0, # FIXME(alexeykuzmin) 'enable_osr%': 0, # FIXME(alexeykuzmin)
'enable_pdf_viewer%': 1, 'enable_pdf_viewer%': 0, # FIXME(deepak1556)
'enable_run_as_node%': 1, 'enable_run_as_node%': 1,
}, },
'enable_osr%': '<(enable_osr)', 'enable_osr%': '<(enable_osr)',

4
filenames.gypi
View file

@ -649,8 +649,6 @@
'chromium_src/library_loaders/libspeechd.h', 'chromium_src/library_loaders/libspeechd.h',
'<@(native_mate_files)', '<@(native_mate_files)',
'<(SHARED_INTERMEDIATE_DIR)/atom_natives.h', '<(SHARED_INTERMEDIATE_DIR)/atom_natives.h',
'<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.cc',
'<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.h',
], ],
'lib_sources_linux': [ 'lib_sources_linux': [
'chromium_src/chrome/browser/icon_loader_auralinux.cc', 'chromium_src/chrome/browser/icon_loader_auralinux.cc',
@ -734,6 +732,8 @@
'atom/browser/ui/webui/pdf_viewer_ui.h', 'atom/browser/ui/webui/pdf_viewer_ui.h',
'chromium_src/components/pdf/renderer/pepper_pdf_host.cc', 'chromium_src/components/pdf/renderer/pepper_pdf_host.cc',
'chromium_src/components/pdf/renderer/pepper_pdf_host.h', 'chromium_src/components/pdf/renderer/pepper_pdf_host.h',
'<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.cc',
'<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.h',
], ],
}], # enable_pdf_viewer }], # enable_pdf_viewer
['enable_run_as_node==1', { ['enable_run_as_node==1', {