diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 15:22:18 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 15:22:18 +0000 |
| commit | 8ebc9b4348260fb7b0c1f116af8d758156359320 (patch) | |
| tree | 46a83cc28bdbb185b47f8d3aa4dac9af86468a63 /build | |
| parent | a17df4d7a6e87c141d1add055516a8244a581a1b (diff) | |
| download | chromium_src-8ebc9b4348260fb7b0c1f116af8d758156359320.zip chromium_src-8ebc9b4348260fb7b0c1f116af8d758156359320.tar.gz chromium_src-8ebc9b4348260fb7b0c1f116af8d758156359320.tar.bz2 | |
Add WebUI certificate viewer to eventually replace GTK certificate viewer.
Hidden behind the gyp flag webui_certificate_viewer, this dialog will replace the GTK certificate viewer as part of the nogtk effort. This CL only adds the new certificate viewer but does not use it unless compiled with webui_certificate_viewer=1.
This is the first stage, which adds the viewer and only shows the "General" certificate details (As shown in the General tab in the GTK viewer). The next steps are to show the detailed information, resolve some minor display and functionality issues on desktop builds and then make this the standard certificate viewer.
BUG=None
TEST=Manually viewed certificate details for several secure sites.
Review URL: http://codereview.chromium.org/7331016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4b9ead9..0913ad3 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -35,6 +35,9 @@ # Disable touch support by default. 'touchui%': 0, + # Disable webui certificate viewer until it is complete. + 'webui_certificate_viewer%': 0, + # Whether the compositor is enabled on views. 'views_compositor%': 0, }, @@ -42,6 +45,7 @@ 'chromeos%': '<(chromeos)', 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 'touchui%': '<(touchui)', + 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 'views_compositor%': '<(views_compositor)', # Compute the architecture that we're building on. @@ -70,12 +74,18 @@ }, { 'toolkit_uses_pure_views%': 0, }], + + # Use WebUI certificate viewer in Touch case + ['touchui==1', { + 'webui_certificate_viewer%': 1 + }], ], }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', + 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', @@ -258,6 +268,7 @@ 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', + 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 'file_manager_extension%': '<(file_manager_extension)', 'inside_chromium_build%': '<(inside_chromium_build)', 'fastbuild%': '<(fastbuild)', @@ -607,6 +618,9 @@ ['touchui==1', { 'grit_defines': ['-D', 'touchui'], }], + ['webui_certificate_viewer==1', { + 'grit_defines': ['-D', 'webui_certificate_viewer'], + }], ['file_manager_extension==1', { 'grit_defines': ['-D', 'file_manager_extension'], }], |