Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 133865743ded94b818e5aa49dc2b0e45fea20ff9..fc9fd9615bd86df4a974fcd878759e5fa85c2bdb 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -202,6 +202,9 @@ |
# Disable file manager component extension by default. |
'file_manager_extension%': 0, |
+ # Disable image loader component extension by default. |
+ 'image_loader_extension%': 0, |
+ |
# Python version. |
'python_ver%': '2.6', |
@@ -473,11 +476,13 @@ |
'use_titlecase_in_grd_files%': 1, |
}], |
- # Enable file manager extension on Chrome OS. |
+ # Enable file manager and image loader extensions on Chrome OS. |
['chromeos==1', { |
'file_manager_extension%': 1, |
+ 'image_loader_extension%': 1, |
}, { |
'file_manager_extension%': 0, |
+ 'image_loader_extension%': 0, |
}], |
['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { |
@@ -684,6 +689,7 @@ |
'enable_touch_ui%': '<(enable_touch_ui)', |
'use_xi2_mt%':'<(use_xi2_mt)', |
'file_manager_extension%': '<(file_manager_extension)', |
+ 'image_loader_extension%': '<(image_loader_extension)', |
'inside_chromium_build%': '<(inside_chromium_build)', |
'fastbuild%': '<(fastbuild)', |
'dcheck_always_on%': '<(dcheck_always_on)', |
@@ -1374,6 +1380,9 @@ |
['file_manager_extension==1', { |
'grit_defines': ['-D', 'file_manager_extension'], |
}], |
+ ['image_loader_extension==1', { |
+ 'grit_defines': ['-D', 'image_loader_extension'], |
+ }], |
['remoting==1', { |
'grit_defines': ['-D', 'remoting'], |
}], |
@@ -1721,6 +1730,9 @@ |
['file_manager_extension==1', { |
'defines': ['FILE_MANAGER_EXTENSION=1'], |
}], |
+ ['image_loader_extension==1', { |
+ 'defines': ['IMAGE_LOADER_EXTENSION=1'], |
+ }], |
['profiling==1', { |
'defines': ['ENABLE_PROFILING=1'], |
}], |