Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 9eb94f3b62828aa0d7dc85ee997c64c58eb56e2f..07a292eea41047b997ef0e1f32c0a85f1e83c3f7 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -35,6 +35,9 @@ |
# Disable touch support by default. |
'touchui%': 0, |
+ # Disable webui bookmark editor until completion. |
Rick Byers
2011/08/04 18:26:07
Perhaps we should consider combining these now int
flackr
2011/08/12 18:11:24
Done.
|
+ 'webui_bookmark_editor%': 0, |
+ |
# Disable webui certificate viewer until it is complete. |
'webui_certificate_viewer%': 0, |
@@ -45,6 +48,7 @@ |
'chromeos%': '<(chromeos)', |
'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
'touchui%': '<(touchui)', |
+ 'webui_bookmark_editor%': '<(webui_bookmark_editor)', |
'webui_certificate_viewer%': '<(webui_certificate_viewer)', |
'views_compositor%': '<(views_compositor)', |
@@ -77,7 +81,8 @@ |
# Use WebUI certificate viewer in Touch case |
Rick Byers
2011/08/04 18:26:07
update comment
flackr
2011/08/12 18:11:24
Done.
|
['touchui==1', { |
- 'webui_certificate_viewer%': 1 |
+ 'webui_certificate_viewer%': 1, |
+ 'webui_bookmark_editor%': 1, |
}], |
], |
}, |
@@ -85,6 +90,7 @@ |
# Copy conditionally-set variables out one scope. |
'chromeos%': '<(chromeos)', |
'touchui%': '<(touchui)', |
+ 'webui_bookmark_editor%': '<(webui_bookmark_editor)', |
'webui_certificate_viewer%': '<(webui_certificate_viewer)', |
'host_arch%': '<(host_arch)', |
'toolkit_views%': '<(toolkit_views)', |
@@ -279,6 +285,7 @@ |
'enable_flapper_hacks%': '<(enable_flapper_hacks)', |
'chromeos%': '<(chromeos)', |
'touchui%': '<(touchui)', |
+ 'webui_bookmark_editor%': '<(webui_bookmark_editor)', |
'webui_certificate_viewer%': '<(webui_certificate_viewer)', |
'file_manager_extension%': '<(file_manager_extension)', |
'inside_chromium_build%': '<(inside_chromium_build)', |
@@ -633,6 +640,9 @@ |
['touchui==1', { |
'grit_defines': ['-D', 'touchui'], |
}], |
+ ['webui_bookmark_editor==1', { |
+ 'grit_defines': ['-D', 'webui_bookmark_editor'], |
+ }], |
['webui_certificate_viewer==1', { |
'grit_defines': ['-D', 'webui_certificate_viewer'], |
}], |