add crypto module password dialog view and test.

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 2781 matching lines @@
         'browser/ui/collected_cookies_infobar_delegate.h',
         'browser/ui/content_settings/content_setting_bubble_model.cc',
         'browser/ui/content_settings/content_setting_bubble_model.h',
         'browser/ui/content_settings/content_setting_image_model.cc',
         'browser/ui/content_settings/content_setting_image_model.h',
         'browser/ui/constrained_window.h',
         'browser/ui/constrained_window_tab_helper.cc',
         'browser/ui/constrained_window_tab_helper.h',
         'browser/ui/constrained_window_tab_helper_delegate.cc',
         'browser/ui/constrained_window_tab_helper_delegate.h',
+        'browser/ui/crypto_module_password_dialog.cc',
         'browser/ui/crypto_module_password_dialog.h',
         'browser/ui/crypto_module_password_dialog_nss.cc',
         'browser/ui/crypto_module_password_dialog_openssl.cc',
+        'browser/ui/crypto_module_password_dialog_view.cc',
+        'browser/ui/crypto_module_password_dialog_view.h',
         'browser/ui/find_bar/find_bar.h',
         'browser/ui/find_bar/find_bar_controller.cc',
         'browser/ui/find_bar/find_bar_controller.h',
         'browser/ui/find_bar/find_bar_state.cc',
         'browser/ui/find_bar/find_bar_state.h',
         'browser/ui/find_bar/find_notification_details.h',
         'browser/ui/find_bar/find_tab_helper.cc',
         'browser/ui/find_bar/find_tab_helper.h',
         'browser/ui/fullscreen_exit_bubble.cc',
         'browser/ui/fullscreen_exit_bubble.h',
@@ skipping 44 matching lines @@
         'browser/ui/gtk/chrome_gtk_frame.h',
         'browser/ui/gtk/collected_cookies_gtk.cc',
         'browser/ui/gtk/collected_cookies_gtk.h',
         'browser/ui/gtk/constrained_html_delegate_gtk.cc',
         'browser/ui/gtk/constrained_window_gtk.cc',
         'browser/ui/gtk/constrained_window_gtk.h',
         'browser/ui/gtk/content_setting_bubble_gtk.cc',
         'browser/ui/gtk/content_setting_bubble_gtk.h',
         'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
         'browser/ui/gtk/create_application_shortcuts_dialog_gtk.h',
-        'browser/ui/gtk/crypto_module_password_dialog.cc',
         'browser/ui/gtk/custom_button.cc',
         'browser/ui/gtk/custom_button.h',
         'browser/ui/gtk/custom_drag.cc',
         'browser/ui/gtk/custom_drag.h',
         'browser/ui/gtk/dialogs_common.cc',
         'browser/ui/gtk/dialogs_common.h',
         'browser/ui/gtk/dialogs_gtk.cc',
         'browser/ui/gtk/dialogs_kde.cc',
         'browser/ui/gtk/download/download_in_progress_dialog_gtk.cc',
         'browser/ui/gtk/download/download_in_progress_dialog_gtk.h',
@@ skipping 1529 matching lines @@
             'browser/history/history_indexer.idl',
             'browser/ui/webui/conflicts_ui.cc',
             'browser/ui/webui/conflicts_ui.h',
           ],
           'sources!': [
             'browser/history/history_publisher_none.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/ui/browser_list_stub.cc',
             'browser/ui/crypto_module_password_dialog_nss.cc',
+            'browser/ui/crypto_module_password_dialog_view.cc',
+            'browser/ui/crypto_module_password_dialog_view.h',

[Emmanuel Saint-loubert-Bié, 2011/10/05 14:33:27]

Because the section says sources! (note the !) this will exclude these files. Is
that what you want? Also in that case do you need the #if defined(OS_WIN) in the
.cc?

[alicet1, 2011/10/06 22:04:08]

windows shouldn't need this. I'll remove the if define(OS_WIN) in the code.

             'browser/ui/panels/panel_mouse_watcher_timer.cc',
             'browser/ui/views/keyboard_overlay_delegate.cc',
             'browser/ui/views/keyboard_overlay_dialog_view.cc',
             'browser/ui/views/native_constrained_window_views.cc',
             'browser/ui/views/select_file_dialog.cc',
             'browser/ui/views/simple_message_box_views.cc',
             'browser/ui/views/simple_message_box_views.h',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
@@ skipping 53 matching lines @@
                 ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
                 ['include', '^browser/ui/gtk/certificate_dialogs.cc'],
                 ['include', '^browser/ui/gtk/certificate_dialogs.h'],
                 ['include', '^browser/ui/gtk/certificate_viewer.cc'],
                 ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
                 ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
                 ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'],
                 ['include', '^browser/ui/gtk/collected_cookies_gtk.h'],
                 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'],
                 ['include', '^browser/ui/gtk/constrained_window_gtk.h'],
-                ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'],
                 ['include', '^browser/ui/gtk/download/download_started_animation_gtk.cc'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
                 ['include', '^browser/ui/gtk/first_run_dialog.cc'],
                 ['include', '^browser/ui/gtk/first_run_dialog.h'],
                 ['include', '^browser/ui/gtk/gtk_chrome_button.cc'],
                 ['include', '^browser/ui/gtk/gtk_chrome_button.h'],
                 ['include', '^browser/ui/gtk/gtk_chrome_cookie_view.cc'],
                 ['include', '^browser/ui/gtk/gtk_chrome_cookie_view.h'],
                 ['include', '^browser/ui/gtk/gtk_chrome_link_button.cc'],
@@ skipping 278 matching lines @@
                 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
               ],
             }],
             # Exclude these toolkit_views specific files again.
             # (Required because of the '^browser/extensions/' include above)
             ['toolkit_views==0', {
               'sources/': [
+                ['exclude', '^browser/ui/crypto_module_password_dialog_view.cc'],
+                ['exclude', '^browser/ui/crypto_module_password_dialog_view.h'],
                 ['exclude', '^browser/extensions/extension_input_api.cc'],
                 ['exclude', '^browser/extensions/extension_input_api.h'],
                 ['exclude', '^browser/extensions/key_identifier_conversion_views.cc'],
                 ['exclude', '^browser/extensions/key_identifier_conversion_views.h'],
               ],
             }],
             # These GTK files haven't been ported to views, while ChromeOS has
             # its own separate implementation below.  So re-include them only on
             # non-ChromeOS views Linux builds.
             ['OS=="linux" and toolkit_views==1 and chromeos==0', {
@@ skipping 35 matching lines @@
                 ['exclude', 'browser/extensions/file_manager_util.cc'],
               ],
             }],
             # GTK build only
             ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
               'sources/': [
                 ['include', '^browser/printing/print_dialog_gtk.cc'],
                 ['include', '^browser/printing/print_dialog_gtk.h'],
                 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
                 ['exclude', '^browser/ui/browser_list_stub.cc'],
+                ['exclude', '^browser/ui/crypto_module_password_dialog_view.cc'],
+                ['exclude', '^browser/ui/crypto_module_password_dialog_view.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.h'],
               ],
             }],
             # Touch build only
             ['OS=="linux" and toolkit_views==1 and touchui==1', {
               'sources/': [
                 ['include', '^browser/ui/login/login_prompt_ui.cc'],
@@ skipping 207 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' ]
     },
   ],
 }