| Index: chrome/chrome_browser_ui.gypi | 
| =================================================================== | 
| --- chrome/chrome_browser_ui.gypi	(revision 244941) | 
| +++ chrome/chrome_browser_ui.gypi	(working copy) | 
| @@ -1451,8 +1451,6 @@ | 
| 'browser/ui/panels/detached_panel_collection.h', | 
| 'browser/ui/panels/detached_panel_drag_handler.cc', | 
| 'browser/ui/panels/detached_panel_drag_handler.h', | 
| -        'browser/ui/panels/display_settings_provider_win.cc', | 
| -        'browser/ui/panels/display_settings_provider_win.h', | 
| 'browser/ui/panels/display_settings_provider.cc', | 
| 'browser/ui/panels/display_settings_provider.h', | 
| 'browser/ui/panels/docked_panel_collection.cc', | 
| @@ -1684,8 +1682,6 @@ | 
| 'browser/ui/views/accessibility/accessibility_event_router_views.h', | 
| 'browser/ui/views/accessibility/invert_bubble_view.cc', | 
| 'browser/ui/views/accessibility/invert_bubble_view.h', | 
| -        'browser/ui/views/app_menu_button_win.cc', | 
| -        'browser/ui/views/app_menu_button_win.h', | 
| 'browser/ui/views/app_list/linux/app_list_controller_delegate_linux.cc', | 
| 'browser/ui/views/app_list/linux/app_list_controller_delegate_linux.h', | 
| 'browser/ui/views/app_list/linux/app_list_linux.cc', | 
| @@ -1802,7 +1798,6 @@ | 
| '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_win.cc', | 
| 'browser/ui/views/dropdown_bar_view.cc', | 
| 'browser/ui/views/dropdown_bar_view.h', | 
| 'browser/ui/views/edit_search_engine_dialog.cc', | 
| @@ -1835,7 +1830,6 @@ | 
| '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_win.cc', | 
| 'browser/ui/views/find_bar_view.cc', | 
| 'browser/ui/views/find_bar_view.h', | 
| 'browser/ui/views/first_run_bubble.cc', | 
| @@ -1850,8 +1844,6 @@ | 
| 'browser/ui/views/frame/browser_frame_ashwin.h', | 
| 'browser/ui/views/frame/browser_frame_common_win.cc', | 
| 'browser/ui/views/frame/browser_frame_common_win.h', | 
| -        'browser/ui/views/frame/browser_frame_win.cc', | 
| -        'browser/ui/views/frame/browser_frame_win.h', | 
| 'browser/ui/views/frame/browser_non_client_frame_view.cc', | 
| 'browser/ui/views/frame/browser_non_client_frame_view.h', | 
| 'browser/ui/views/frame/browser_non_client_frame_view_ash.h', | 
| @@ -1901,7 +1893,6 @@ | 
| 'browser/ui/views/frame/native_browser_frame_factory_auralinux.cc', | 
| 'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc', | 
| 'browser/ui/views/frame/native_browser_frame_factory_desktop_ash.cc', | 
| -        'browser/ui/views/frame/native_browser_frame_factory_win.cc', | 
| 'browser/ui/views/frame/native_browser_frame_factory.cc', | 
| 'browser/ui/views/frame/native_browser_frame_factory.h', | 
| 'browser/ui/views/frame/opaque_browser_frame_view.cc', | 
| @@ -2104,8 +2095,6 @@ | 
| 'browser/ui/views/tabs/dragged_tab_view.cc', | 
| 'browser/ui/views/tabs/dragged_tab_view.h', | 
| 'browser/ui/views/tabs/native_view_photobooth.h', | 
| -        'browser/ui/views/tabs/native_view_photobooth_win.cc', | 
| -        'browser/ui/views/tabs/native_view_photobooth_win.h', | 
| 'browser/ui/views/tabs/stacked_tab_strip_layout.cc', | 
| 'browser/ui/views/tabs/stacked_tab_strip_layout.h', | 
| 'browser/ui/views/tabs/tab.cc', | 
| @@ -2620,7 +2609,6 @@ | 
| 'browser/ui/window_sizer/window_sizer_aura.cc', | 
| 'browser/ui/window_sizer/window_sizer_gtk.cc', | 
| 'browser/ui/window_sizer/window_sizer_mac.mm', | 
| -        'browser/ui/window_sizer/window_sizer_win.cc', | 
| 'browser/ui/window_snapshot/window_snapshot.cc', | 
| 'browser/ui/window_snapshot/window_snapshot.h', | 
| 'browser/ui/zoom/zoom_controller.cc', | 
| @@ -2799,7 +2787,6 @@ | 
| 'browser/ui/ash/chrome_shell_delegate_views.cc', | 
| 'browser/ui/ash/multi_user/multi_user_context_menu.cc', | 
| 'browser/ui/ash/session_state_delegate_views.cc', | 
| -            'browser/ui/screen_capture_notification_ui_stub.cc', | 
| 'browser/ui/startup/default_browser_prompt.cc', | 
| 'browser/ui/startup/default_browser_prompt.h', | 
| 'browser/ui/views/app_list/linux/app_list_service_linux.cc', | 
| @@ -2882,24 +2869,11 @@ | 
| ['use_aura==1', { | 
| 'sources/': [ | 
| ['exclude', '^browser/ui/external_protocol_dialog_delegate.cc'], | 
| -            ['exclude', '^browser/ui/panels/display_settings_provider_win.cc'], | 
| -            ['exclude', '^browser/ui/panels/taskbar_window_thumbnailer_win.cc'], | 
| -            ['exclude', '^browser/ui/panels/taskbar_window_thumbnailer_win.h'], | 
| ['exclude', '^browser/ui/screen_capture_notification_ui_stub.cc'], | 
| ['exclude', '^browser/ui/views/about_ipc_dialog.cc'], | 
| -            ['exclude', '^browser/ui/views/app_menu_button_win.cc'], | 
| -            ['exclude', '^browser/ui/views/dropdown_bar_host_win.cc'], | 
| -            ['exclude', '^browser/ui/views/find_bar_host_win.cc'], | 
| -            ['exclude', '^browser/ui/views/frame/browser_frame_win.cc'], | 
| -            ['exclude', '^browser/ui/views/frame/browser_frame_win.h'], | 
| ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc'], | 
| -            ['exclude', '^browser/ui/views/frame/native_browser_frame_factory_win.cc'], | 
| -            ['exclude', '^browser/ui/views/importer/import_progress_dialog_view.cc'], | 
| ['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/user_data_dir_dialog_view.cc'], | 
| -            ['exclude', '^browser/ui/window_sizer/window_sizer_win.cc'], | 
| # TODO: (stevenjb/beng): Find a home for these. | 
| ['include', '^browser/ui/views/simple_message_box_views.cc'], | 
| ['include', '^browser/ui/webui/certificate_viewer_webui.cc'], | 
| @@ -2918,7 +2892,6 @@ | 
| ['OS=="win"', { | 
| 'sources/': [ | 
| ['exclude', '^browser/ui/views/apps/chrome_shell_window_delegate_views.cc'], | 
| -                ['exclude', '^browser/ui/views/hwnd_util_win.cc'], | 
| ['exclude', '^browser/ui/views/theme_image_mapper.cc'], | 
| ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'], | 
| ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'], | 
| @@ -3248,7 +3221,6 @@ | 
| 'sources!': [ | 
| 'browser/ui/certificate_dialogs.cc', | 
| 'browser/ui/certificate_dialogs.h', | 
| -            'browser/ui/screen_capture_notification_ui_stub.cc', | 
| 'browser/ui/startup/autolaunch_prompt.cc', | 
| 'browser/ui/views/frame/taskbar_decorator.cc', | 
| 'browser/ui/views/simple_message_box_views.cc', | 
|  |