MD Settings: Hooking up native certificate manager.

chrome/chrome_browser_ui.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 2793 matching lines @@
     'chrome_browser_ui_nss_sources': [
       'browser/ui/crypto_module_delegate_nss.cc',
       'browser/ui/crypto_module_delegate_nss.h',
       'browser/ui/crypto_module_password_dialog_nss.cc',
       'browser/ui/crypto_module_password_dialog_nss.h',
       'browser/ui/webui/options/certificate_manager_handler.cc',
       'browser/ui/webui/options/certificate_manager_handler.h',
       'browser/ui/webui/settings/certificates_handler.cc',
       'browser/ui/webui/settings/certificates_handler.h',
     ],
+    'chrome_browser_ui_non_nss_sources': [

[Dan Beam, 2016/03/31 00:20:57]

nit: chrome_browser_ui_native_certificates_sources ?

[dpapad, 2016/03/31 01:15:03]

I prefer the "non_nss_sources" over "native_certificates_sources", because it is
not clear that "native certificates" is a complement of "nss certificates",
whereas "non nss" clearly communicates that it is a complement.

+      'browser/ui/webui/settings/native_certificates_handler.cc',
+      'browser/ui/webui/settings/native_certificates_handler.h',
+    ],
     'chrome_browser_ui_omnibox_non_mobile_sources': [
       'browser/ui/omnibox/alternate_nav_infobar_delegate.cc',
       'browser/ui/omnibox/alternate_nav_infobar_delegate.h',
       'browser/ui/omnibox/chrome_omnibox_client.cc',
       'browser/ui/omnibox/chrome_omnibox_client.h',
       'browser/ui/omnibox/chrome_omnibox_edit_controller.cc',
       'browser/ui/omnibox/chrome_omnibox_edit_controller.h',
       'browser/ui/omnibox/chrome_omnibox_navigation_observer.cc',
       'browser/ui/omnibox/chrome_omnibox_navigation_observer.h',
       'browser/ui/omnibox/clipboard_utils.cc',
@@ skipping 297 matching lines @@
           ],
         }],
         ['ui_compositor_image_transport==1', {
           'dependencies': [
             '../ui/gl/gl.gyp:gl',
           ],
         }],
         ['use_nss_certs==1', {
           'sources': [ '<@(chrome_browser_ui_nss_sources)' ],
         }],
+        ['use_nss_certs==0 and (OS=="win" or OS=="mac")', {
+          'sources': [ '<@(chrome_browser_ui_non_nss_sources)' ],
+        }],
         ['enable_themes==0', {
           'sources!': [
             'browser/ui/webui/theme_source.cc',
           ],
         }],
         ['enable_print_preview==1', {
           'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ],
         }],
         ['OS=="android"', {
           'dependencies': [
@@ skipping 232 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }