Make use_nss a gyp var so that aura can build w/ nss.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'dependencies': [
@@ skipping 301 matching lines @@
         'browser/browsing_data_quota_helper.cc',
         'browser/browsing_data_quota_helper.h',
         'browser/browsing_data_quota_helper_impl.cc',
         'browser/browsing_data_quota_helper_impl.h',
         'browser/browsing_data_remover.cc',
         'browser/browsing_data_remover.h',
         'browser/bug_report_data.cc',
         'browser/bug_report_data.h',
         'browser/bug_report_util.cc',
         'browser/bug_report_util.h',
-        'browser/certificate_manager_model.cc',
-        'browser/certificate_manager_model.h',

[mattm, 2011/10/05 03:44:47]

These should stay here and be excluded when we don't need them.  (There's a
general idiom of doing that.   Some IDE like VS let you search among all files
even ones the platform doesn't use, but only if they are listed here and then
excluded later.)

[DaveMoore, 2011/10/05 04:02:57]

Done.

         'browser/certificate_viewer.cc',
         'browser/certificate_viewer.h',
         'browser/character_encoding.cc',
         'browser/character_encoding.h',
         'browser/chrome_benchmarking_message_filter.cc',
         'browser/chrome_benchmarking_message_filter.h',
         'browser/chrome_browser_application_mac.h',
         'browser/chrome_browser_application_mac.mm',
         'browser/chrome_browser_main.cc',
         'browser/chrome_browser_main.h',
@@ skipping 3825 matching lines @@
         # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
         # native certificate viewers).
         ['os_posix == 0 or OS == "mac"', {
           'sources/': [
             ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer.h'],
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
           ],
         }],
+        ['use_nss==1', {
+          'sources': [
+            'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
+            'third_party/mozilla_security_manager/nsNSSCertHelper.h',
+            'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
+            'third_party/mozilla_security_manager/nsNSSCertificate.h',
+            'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
+            'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
+          ],
+        }],
+        ['use_nss==1 or use_openssl==1', {
+          'sources': [

[mattm, 2011/10/05 03:44:47]

Should keep it the excluding way

[DaveMoore, 2011/10/05 04:02:57]

Done.

+            'browser/certificate_manager_model.cc',
+            'browser/certificate_manager_model.h',
+            'browser/ui/webui/options/certificate_manager_handler.cc',
+            'browser/ui/webui/options/certificate_manager_handler.h',
+          ],
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:ssl',
             '../build/linux/system.gyp:x11',
             '../dbus/dbus.gyp:dbus',
             '../third_party/undoview/undoview.gyp:undoview',
@@ skipping 33 matching lines @@
               'include_dirs': [
                 # breakpad_linux.cc uses generated file_version_info_linux.h.
                 '<(SHARED_INTERMEDIATE_DIR)',
                 '../breakpad/src',
               ],
             }, {  # linux_breakpad==0
               'sources': [
                 'browser/crash_handler_host_linux_stub.cc',
               ],
             }],
-            ['use_openssl==0', {
-              'sources': [
-                'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
-                'third_party/mozilla_security_manager/nsNSSCertHelper.h',
-                'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
-                'third_party/mozilla_security_manager/nsNSSCertificate.h',
-                'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
-                'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
-              ],
-            }],
-          ],
-        }, {  # toolkit_uses_gtk != 1
-          'sources!': [
-            # TODO(mattm): Cert manager stuff is really !USE_NSS.
-            'browser/certificate_manager_model.cc',
-            'browser/certificate_manager_model.h',
-            'browser/ui/webui/options/certificate_manager_handler.cc',
-            'browser/ui/webui/options/certificate_manager_handler.h',
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
             'browser/first_run/upgrade_util.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
@@ skipping 739 matching lines @@
             ['include', '^browser/crash_handler_host_linux_stub.cc'],
             ['include', '^browser/ui/login/login_prompt_ui.cc'],
             ['include', '^browser/ui/views/aura/aura_init.cc'],
             ['include', '^browser/ui/views/browser_bubble_aura.cc'],
             ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
             ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'],
             ['include', '^browser/ui/views/frame/browser_frame_aura.cc'],
             ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
             ['include', '^browser/ui/views/select_file_dialog.cc'],
             ['include', '^browser/ui/views/stubs_aura.cc'],
-            ['include', '^browser/ui/webui/options/certificate_manager_handler.cc'],
           ],
         }],
         [ 'use_openssl==1', {
           'sources!': [
             'browser/importer/nss_decryptor.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/ui/crypto_module_password_dialog_nss.cc',
           ]}, {
            'sources!': [
@@ skipping 61 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }