Index: chrome/chrome_browser.gypi |
=================================================================== |
--- chrome/chrome_browser.gypi (revision 99983) |
+++ chrome/chrome_browser.gypi (working copy) |
@@ -199,6 +199,7 @@ |
'browser/automation/automation_extension_tracker.h', |
'browser/automation/automation_provider.cc', |
'browser/automation/automation_provider.h', |
+ 'browser/automation/automation_provider_aura.cc', |
'browser/automation/automation_provider_gtk.cc', |
'browser/automation/automation_provider_json.cc', |
'browser/automation/automation_provider_json.h', |
@@ -227,6 +228,7 @@ |
'browser/automation/chrome_frame_automation_provider.h', |
'browser/automation/testing_automation_provider.cc', |
'browser/automation/testing_automation_provider.h', |
+ 'browser/automation/testing_automation_provider_aura.cc', |
'browser/automation/testing_automation_provider_chromeos.cc', |
'browser/automation/testing_automation_provider_gtk.cc', |
'browser/automation/testing_automation_provider_mac.mm', |
@@ -1188,6 +1190,7 @@ |
'browser/file_select_helper.h', |
'browser/first_run/first_run.cc', |
'browser/first_run/first_run.h', |
+ 'browser/first_run/first_run_aura.cc', |
'browser/first_run/first_run_browser_process.cc', |
'browser/first_run/first_run_browser_process.h', |
'browser/first_run/first_run_dialog.h', |
@@ -1633,6 +1636,7 @@ |
'browser/pdf_unsupported_feature.cc', |
'browser/pdf_unsupported_feature.h', |
'browser/platform_util.h', |
+ 'browser/platform_util_aura.cc', |
'browser/platform_util_chromeos.cc', |
'browser/platform_util_common_linux.cc', |
'browser/platform_util_linux.cc', |
@@ -1848,6 +1852,7 @@ |
'browser/process_info_snapshot.h', |
'browser/process_info_snapshot_mac.cc', |
'browser/process_singleton.h', |
+ 'browser/process_singleton_aura.cc', |
'browser/process_singleton_linux.cc', |
'browser/process_singleton_mac.cc', |
'browser/process_singleton_win.cc', |
@@ -3006,6 +3011,7 @@ |
'browser/ui/omnibox/omnibox_view.h', |
'browser/ui/options/options_util.cc', |
'browser/ui/options/options_util.h', |
+ 'browser/ui/panels/auto_hiding_desktop_bar_aura.cc', |
'browser/ui/panels/auto_hiding_desktop_bar_chromeos.cc', |
'browser/ui/panels/auto_hiding_desktop_bar_cocoa.mm', |
'browser/ui/panels/auto_hiding_desktop_bar_gtk.cc', |
@@ -3058,6 +3064,7 @@ |
'browser/ui/tab_contents/tab_contents_wrapper_synced_tab_delegate.h', |
'browser/ui/tabs/dock_info.cc', |
'browser/ui/tabs/dock_info.h', |
+ 'browser/ui/tabs/dock_info_aura.cc', |
'browser/ui/tabs/dock_info_gtk.cc', |
'browser/ui/tabs/dock_info_mac.cc', |
'browser/ui/tabs/dock_info_win.cc', |
@@ -3134,6 +3141,7 @@ |
'browser/ui/views/browser_actions_container.h', |
'browser/ui/views/browser_bubble.cc', |
'browser/ui/views/browser_bubble.h', |
+ 'browser/ui/views/browser_bubble_aura.cc', |
'browser/ui/views/browser_bubble_gtk.cc', |
'browser/ui/views/browser_bubble_win.cc', |
'browser/ui/views/browser_dialogs.h', |
@@ -3188,6 +3196,7 @@ |
'browser/ui/views/download/download_started_animation_win.cc', |
'browser/ui/views/dropdown_bar_host.cc', |
'browser/ui/views/dropdown_bar_host.h', |
+ 'browser/ui/views/dropdown_bar_host_aura.cc', |
'browser/ui/views/dropdown_bar_host_delegate.h', |
'browser/ui/views/dropdown_bar_host_gtk.cc', |
'browser/ui/views/dropdown_bar_host_win.cc', |
@@ -3219,6 +3228,7 @@ |
'browser/ui/views/file_manager_dialog.h', |
'browser/ui/views/find_bar_host.cc', |
'browser/ui/views/find_bar_host.h', |
+ 'browser/ui/views/find_bar_host_aura.cc', |
'browser/ui/views/find_bar_host_gtk.cc', |
'browser/ui/views/find_bar_host_win.cc', |
'browser/ui/views/find_bar_view.cc', |
@@ -3233,6 +3243,8 @@ |
'browser/ui/views/frame/browser_bubble_host.h', |
'browser/ui/views/frame/browser_frame.cc', |
'browser/ui/views/frame/browser_frame.h', |
+ 'browser/ui/views/frame/browser_frame_aura.cc', |
+ 'browser/ui/views/frame/browser_frame_aura.h', |
'browser/ui/views/frame/browser_frame_gtk.cc', |
'browser/ui/views/frame/browser_frame_gtk.h', |
'browser/ui/views/frame/browser_frame_views.cc', |
@@ -3333,6 +3345,7 @@ |
'browser/ui/views/location_bar/suggested_text_view.h', |
'browser/ui/views/login_view.cc', |
'browser/ui/views/login_view.h', |
+ 'browser/ui/views/native_constrained_window_aura.cc', |
'browser/ui/views/native_constrained_window_win.cc', |
'browser/ui/views/notifications/balloon_view.cc', |
'browser/ui/views/notifications/balloon_view.h', |
@@ -3355,6 +3368,7 @@ |
'browser/ui/views/sad_tab_view.cc', |
'browser/ui/views/sad_tab_view.h', |
'browser/ui/views/select_file_dialog.cc', |
+ 'browser/ui/views/shell_dialogs_aura.cc', |
'browser/ui/views/shell_dialogs_win.cc', |
'browser/ui/views/simple_message_box_win.cc', |
'browser/ui/views/simple_message_box_views.cc', |
@@ -3368,7 +3382,10 @@ |
'browser/ui/views/status_icons/status_tray_gtk.cc', |
'browser/ui/views/status_icons/status_tray_win.cc', |
'browser/ui/views/status_icons/status_tray_win.h', |
+ 'browser/ui/views/stubs_aura.cc', |
'browser/ui/views/tab_contents/native_tab_contents_container.h', |
+ 'browser/ui/views/tab_contents/native_tab_contents_container_aura.cc', |
+ 'browser/ui/views/tab_contents/native_tab_contents_container_aura.h', |
'browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc', |
'browser/ui/views/tab_contents/native_tab_contents_container_gtk.h', |
'browser/ui/views/tab_contents/native_tab_contents_container_views.cc', |
@@ -3377,6 +3394,8 @@ |
'browser/ui/views/tab_contents/native_tab_contents_container_win.h', |
'browser/ui/views/tab_contents/native_tab_contents_view.h', |
'browser/ui/views/tab_contents/native_tab_contents_view_delegate.h', |
+ 'browser/ui/views/tab_contents/native_tab_contents_view_aura.cc', |
+ 'browser/ui/views/tab_contents/native_tab_contents_view_aura.h', |
'browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc', |
'browser/ui/views/tab_contents/native_tab_contents_view_gtk.h', |
'browser/ui/views/tab_contents/native_tab_contents_view_views.cc', |
@@ -3983,21 +4002,23 @@ |
['exclude', '^browser/first_run/first_run_win.cc'], |
['exclude', '^browser/first_run/try_chrome_dialog_view.cc'], |
['exclude', '^browser/first_run/try_chrome_dialog_view.h'], |
- ['exclude', '^browser/hang_monitor/hung_plugin_action.cc'], |
- ['exclude', '^browser/hang_monitor/hung_plugin_action.h'], |
- ['exclude', '^browser/hang_monitor/hung_window_detector.cc'], |
- ['exclude', '^browser/hang_monitor/hung_window_detector.h'], |
+ ['exclude', '^browser/hang_monitor/'], |
['exclude', '^browser/platform_util_win.cc'], |
['exclude', '^browser/process_singleton_win.cc'], |
['exclude', '^browser/tab_contents/web_drag_source_win.cc'], |
['exclude', '^browser/tab_contents/web_drag_source_win.h'], |
+ ['exclude', '^browser/ui/panels/auto_hiding_desktop_bar_win.cc'], |
['exclude', '^browser/ui/tabs/dock_info_win.cc'], |
['exclude', '^browser/ui/views/about_ipc_dialog.cc'], |
['exclude', '^browser/ui/views/app_menu_button_win.cc'], |
+ ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'], |
+ ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view.h'], |
['exclude', '^browser/ui/views/browser_bubble_win.cc'], |
['exclude', '^browser/ui/views/bubble/border_widget_win.cc'], |
['exclude', '^browser/ui/views/bubble/border_widget_win.h'], |
['exclude', '^browser/ui/views/certificate_viewer_win.cc'], |
+ ['exclude', '^browser/ui/views/collected_cookies_win.cc'], |
+ ['exclude', '^browser/ui/views/collected_cookies_win.h'], |
['exclude', '^browser/ui/views/dropdown_bar_host_win.cc'], |
['exclude', '^browser/ui/views/external_protocol_dialog.cc'], |
['exclude', '^browser/ui/views/find_bar_host_win.cc'], |
@@ -4013,6 +4034,7 @@ |
['exclude', '^browser/ui/views/omnibox/omnibox_view_win.h'], |
['exclude', '^browser/ui/views/shell_dialogs_win.cc'], |
['exclude', '^browser/ui/views/simple_message_box_win.cc'], |
+ ['exclude', '^browser/ui/views/ssl_client_certificate_selector.cc'], |
['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.cc'], |
['exclude', '^browser/ui/views/tab_contents/native_tab_contents_container_win.h'], |
['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_win.cc'], |
@@ -4022,9 +4044,16 @@ |
['exclude', '^browser/ui/views/tabs/native_view_photobooth.h'], |
['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.cc'], |
['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.h'], |
+ ['exclude', '^browser/ui/views/task_manager_view.cc'], |
+ ['exclude', '^browser/ui/views/task_manager_view.h'], |
['exclude', '^browser/ui/views/user_data_dir_dialog.cc'], |
['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'], |
+ ['include', '^browser/ui/views/simple_message_box_views.cc'], |
+ ['include', '^browser/ui/views/simple_message_box_views.h'], |
], |
+ 'dependencies': [ |
+ '../aura/aura.gyp:aura', |
+ ], |
}], |
['webui_dialogs == 1', { |
'defines': [ |