diff --git a/build/common.gypi b/build/common.gypi index c18ccad7a5704..9a4c150bc719d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -556,6 +556,9 @@ # Enable web audio hrtf by default. 'disable_webaudio_hrtf%': 0, + # Include all resources by default. + 'use_minimum_resources%': 0, + # Use native android functions in place of ICU. Not supported by most # components. 'use_icu_alternatives_on_android%': 0, @@ -1206,6 +1209,7 @@ 'disable_file_support%': '<(disable_file_support)', 'disable_ftp_support%': '<(disable_ftp_support)', 'disable_webaudio_hrtf%': '<(disable_webaudio_hrtf)', + 'use_minimum_resources%': '<(use_minimum_resources)', 'use_icu_alternatives_on_android%': '<(use_icu_alternatives_on_android)', 'enable_task_manager%': '<(enable_task_manager)', 'sas_dll_path%': '<(sas_dll_path)', @@ -2147,6 +2151,9 @@ ['disable_webaudio_hrtf==1', { 'grit_defines': ['-D', 'disable_webaudio_hrtf'], }], + ['use_minimum_resources==1', { + 'grit_defines': ['-D', 'use_minimum_resources'], + }], ['enable_media_router==1', { 'grit_defines': ['-D', 'enable_media_router'], }], @@ -2978,6 +2985,9 @@ ['disable_ftp_support==1', { 'defines': ['DISABLE_FTP_SUPPORT=1'], }], + ['use_minimum_resources==1', { + 'defines': ['USE_MINIMUM_RESOURCES=1'], + }], ['enable_supervised_users==1', { 'defines': ['ENABLE_SUPERVISED_USERS=1'], }], diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc index 7aa688466d397..6b3f6335702c8 100644 --- a/content/child/blink_platform_impl.cc +++ b/content/child/blink_platform_impl.cc @@ -741,6 +741,7 @@ struct DataResource { const DataResource kDataResources[] = { {"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P}, {"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P}, +#if !defined(USE_MINIMUM_RESOURCES) {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P}, {"mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER, @@ -854,6 +855,7 @@ const DataResource kDataResources[] = { {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P}, +#endif {"panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P}, {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 17b524813fe72..1e85b71e8c5be 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -12,6 +12,15 @@ + + + + + + + + + @@ -305,7 +314,6 @@ - @@ -323,7 +331,6 @@ - @@ -386,12 +393,6 @@ - - - - - - @@ -594,6 +595,7 @@ +