Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5342)

Unified Diff: chrome/chrome_browser.gypi

Issue 8115020: add crypto module password dialog view and test. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: include CryptoModulePasswordDialogView only when libviews.a is present. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/crypto_module_password_dialog.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 243210976b8d591d97ddb1f24ba4c96fec389fb2..90f08f93cfd2b9327fe749315ee95f2c59fbfa1f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2799,9 +2799,12 @@
'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',
@@ -2866,7 +2869,6 @@
'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',
@@ -4416,6 +4418,8 @@
'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 !) thi
alicet1 2011/10/06 22:04:08 windows shouldn't need this. I'll remove the if de
'browser/ui/panels/panel_mouse_watcher_timer.cc',
'browser/ui/views/keyboard_overlay_delegate.cc',
'browser/ui/views/keyboard_overlay_dialog_view.cc',
@@ -4489,7 +4493,6 @@
['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'],
@@ -4788,6 +4791,8 @@
# (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'],
@@ -4843,6 +4848,8 @@
['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'],
« no previous file with comments | « chrome/browser/ui/gtk/crypto_module_password_dialog.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698