Enable ConstrainedHtmlDialog resources for linux views and linux/win aura.

This covers linux_views,chromeos,touch and aura on both win andlinux.
Remove unnecessary code in dialog_stub_gtk and simplified gyp a bit.

BUG=99937
TEST=none


Review URL: http://codereview.chromium.org/8231001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105449 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 26 insertions, 19 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a698c4f..7f97936 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3997,17 +3997,10 @@
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
-            ['exclude', 'browser/ui/login/login_prompt_ui.cc'],
             ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'],
             ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
-            ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.cc'],
-            ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.h'],
-            ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.cc'],
-            ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.h'],
             ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
             ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
-            ['exclude', 'browser/ui/webui/repost_form_warning_ui.cc'],
-            ['exclude', 'browser/ui/webui/repost_form_warning_ui.h'],
           ],
         }],
         ['chromeos==1', {
@@ -4156,8 +4149,6 @@
             ['include', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
             ['include', '^browser/ui/webui/cookies_tree_model_adapter.cc'],
             ['include', '^browser/ui/webui/cookies_tree_model_adapter.h'],
-            ['include', '^browser/ui/webui/repost_form_warning_ui.cc'],
-            ['include', '^browser/ui/webui/repost_form_warning_ui.h'],
           ],
           'dependencies': [
             '../ui/aura_shell/aura_shell.gyp:aura_shell',
@@ -4473,6 +4464,7 @@
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/ui/browser_list_stub.cc',
             'browser/ui/crypto_module_password_dialog_nss.cc',
+            'browser/ui/login/login_prompt_ui.cc',
             'browser/ui/panels/panel_mouse_watcher_timer.cc',
             'browser/ui/views/keyboard_overlay_delegate.cc',
             'browser/ui/views/keyboard_overlay_dialog_view.cc',
@@ -4480,6 +4472,12 @@
             'browser/ui/views/select_file_dialog.cc',
             'browser/ui/views/simple_message_box_views.cc',
             'browser/ui/views/simple_message_box_views.h',
+            'browser/ui/webui/collected_cookies_ui_delegate.cc',
+            'browser/ui/webui/collected_cookies_ui_delegate.h',
+            'browser/ui/webui/cookies_tree_model_adapter.cc',
+            'browser/ui/webui/cookies_tree_model_adapter.h',
+            'browser/ui/webui/repost_form_warning_ui.cc',
+            'browser/ui/webui/repost_form_warning_ui.h',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
@@ -4585,6 +4583,7 @@
                 ['include', '^browser/ui/gtk/task_manager_gtk.h'],
                 ['include', '^browser/ui/gtk/view_id_util.cc'],
                 ['include', '^browser/ui/gtk/view_id_util.h'],
+                ['include', '^browser/ui/login/login_prompt_ui.cc'],
                 ['include', '^browser/ui/tabs/dock_info.cc'],
                 ['include', '^browser/ui/tabs/dock_info.h'],
                 ['include', '^browser/ui/views/about_chrome_view.cc'],
@@ -4817,6 +4816,13 @@
                 ['include', '^browser/ui/views/window.h'],
                 ['include', '^browser/ui/views/wrench_menu.cc'],
                 ['include', '^browser/ui/views/wrench_menu.h'],
+                ['include', '^browser/ui/webui/repost_form_warning_ui.cc'],
+                ['include', '^browser/ui/webui/repost_form_warning_ui.h'],
+                ['include', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
+                ['include', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
+                ['include', '^browser/ui/webui/cookies_tree_model_adapter.cc'],
+                ['include', '^browser/ui/webui/cookies_tree_model_adapter.h'],
+
                 ['include', '^browser/ui/window_sizer.cc'],
                 ['include', '^browser/ui/window_sizer.h'],
 
@@ -4833,9 +4839,20 @@
                 ['exclude', '^browser/ui/browser_list_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
+                ['exclude', '^browser/ui/login/login_prompt_gtk.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
               ],
+            }, { # else: OS=="linux" and toolkit_views==1
+              'sources/': [
+                ['exclude', '^browser/ui/login/login_prompt_ui.cc'],
+                ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
+                ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
+                ['exclude', '^browser/ui/webui/cookies_tree_model_adapter.cc'],
+                ['exclude', '^browser/ui/webui/cookies_tree_model_adapter.h'],
+                ['exclude', '^browser/ui/webui/repost_form_warning_ui.cc'],
+                ['exclude', '^browser/ui/webui/repost_form_warning_ui.h'],
+              ]
             }],
             # Exclude these toolkit_views specific files again.
             # (Required because of the '^browser/extensions/' include above)
@@ -4911,7 +4928,6 @@
             # Touch build only
             ['OS=="linux" and toolkit_views==1 and touchui==1', {
               'sources/': [
-                ['include', '^browser/ui/login/login_prompt_ui.cc'],
                 ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
                 ['include', '^browser/ui/views/constrained_window_views.cc'],
                 ['include', '^browser/ui/views/constrained_window_views.h'],
@@ -4921,19 +4937,12 @@
                 ['include', '^browser/ui/views/native_constrained_window_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],
-                ['include', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
-                ['include', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
-                ['include', '^browser/ui/webui/cookies_tree_model_adapter.cc'],
-                ['include', '^browser/ui/webui/cookies_tree_model_adapter.h'],
-                ['include', '^browser/ui/webui/repost_form_warning_ui.cc'],
-                ['include', '^browser/ui/webui/repost_form_warning_ui.h'],
                 ['exclude', '^browser/ui/gtk/collected_cookies_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/constrained_window_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'],
                 ['exclude', '^browser/ui/gtk/repost_form_warning_gtk.cc'],
                 ['exclude', '^browser/ui/gtk/repost_form_warning_gtk.h'],
                 ['exclude', '^browser/ui/gtk/ssl_client_certificate_selector.cc'],
-                ['exclude', '^browser/ui/login/login_prompt_gtk.cc'],
                 ['exclude', '^browser/ui/views/constrained_html_delegate_gtk.cc'],
                 ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
                 ['exclude', '^browser/ui/views/tabs/tab_strip_factory.cc'],
@@ -4955,7 +4964,6 @@
                 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
                 ['exclude', '^browser/notifications/balloon_collection_gtk.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_views.cc'],
-                ['exclude', '^browser/ui/login/login_prompt_gtk.cc'],
                 ['exclude', '^browser/ui/views/download/download_item_view.cc'],
                 ['exclude', '^browser/ui/views/download/download_item_view.h'],
                 ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
@@ -5038,7 +5046,6 @@
             ['exclude', '^browser/process_singleton_linux.cc'],
             ['exclude', '^browser/ui/input_window_dialog.h'],
             ['exclude', '^browser/ui/input_window_dialog_win.cc'],
-            ['include', '^browser/ui/login/login_prompt_ui.cc'],
             ['include', '^browser/ui/views/browser_bubble_aura.cc'],
             ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
             ['include', '^browser/ui/views/constrained_window_views.cc'],