Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index 5a8cbeb93d9c82aed22bdedf5dfdafcb51a43513..d9e7c59eba269b8bb4008ba8eb9c17a7d1cf6361 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -2901,6 +2901,7 @@ |
'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h', |
'browser/ui/views/autocomplete/autocomplete_result_view.cc', |
'browser/ui/views/autocomplete/autocomplete_result_view.h', |
+ 'browser/ui/views/autocomplete/autocomplete_result_view_model.h', |
'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc', |
'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h', |
'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc', |
@@ -3533,7 +3534,6 @@ |
['exclude', 'browser/renderer_host/offline_resource_handler.h'], |
['exclude', 'browser/ui/login/login_prompt_ui.cc'], |
['exclude', 'browser/ui/webui/active_downloads_ui.cc'], |
- ['exclude', 'browser/ui/webui/chrome_about_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'], |
@@ -3577,13 +3577,13 @@ |
['exclude', '^browser/chromeos/login/dom_*'], |
['exclude', '^browser/extensions/extension_input_ui_api.cc'], |
['exclude', '^browser/extensions/extension_input_ui_api.h'], |
- ['exclude', '^browser/webui/keyboard_ui.*'], |
['exclude', '^browser/renderer_host/render_widget_host_view_views.*'], |
['exclude', '^browser/ui/touch/*'], |
['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'], |
['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.h'], |
['exclude', '^browser/ui/views/tab_contents/tab_contents_view_touch.*'], |
['exclude', '^browser/ui/webui/chromeos/login/'], |
+ ['exclude', '^browser/ui/webui/keyboard_ui.*'], |
], |
}], |
['touchui==1', { |
@@ -3967,7 +3967,6 @@ |
['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'], |
['include', '^browser/ui/gtk/owned_widget_gtk.cc'], |
['include', '^browser/ui/gtk/owned_widget_gtk.h'], |
- ['include', '^browser/ui/gtk/popup_blocked_animation_gtk.cc'], |
['include', '^browser/ui/gtk/repost_form_warning_gtk.cc'], |
['include', '^browser/ui/gtk/repost_form_warning_gtk.h'], |
['include', '^browser/ui/gtk/ssl_client_certificate_selector.cc'], |
@@ -3977,7 +3976,8 @@ |
['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/profile_menu_model.cc'], |
+ ['include', '^browser/ui/profile_menu_model.h'], |
['include', '^browser/ui/tabs/dock_info.cc'], |
['include', '^browser/ui/tabs/dock_info.h'], |
['include', '^browser/ui/views/about_chrome_view.cc'], |
@@ -3990,8 +3990,6 @@ |
['include', '^browser/ui/views/accessible_pane_view.h'], |
['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc'], |
['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.h'], |
- ['include', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.cc'], |
- ['include', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.h'], |
['include', '^browser/ui/views/autocomplete/autocomplete_result_view.cc'], |
['include', '^browser/ui/views/autocomplete/autocomplete_result_view.h'], |
['include', '^browser/ui/views/autocomplete/autocomplete_result_view_model.h'], |
@@ -4046,8 +4044,6 @@ |
['include', '^browser/ui/views/download/download_item_view.h'], |
['include', '^browser/ui/views/download/download_shelf_view.cc'], |
['include', '^browser/ui/views/download/download_shelf_view.h'], |
- ['include', '^browser/ui/views/dragged_tab_controller.cc'], |
- ['include', '^browser/ui/views/dragged_tab_controller.h'], |
['include', '^browser/ui/views/dropdown_bar_host.cc'], |
['include', '^browser/ui/views/dropdown_bar_host.h'], |
['include', '^browser/ui/views/dropdown_bar_host_gtk.cc'], |
@@ -4055,8 +4051,6 @@ |
['include', '^browser/ui/views/dropdown_bar_view.h'], |
['include', '^browser/ui/views/event_utils.cc'], |
['include', '^browser/ui/views/event_utils.h'], |
- ['include', '^browser/ui/views/extension_view.cc'], |
- ['include', '^browser/ui/views/extension_view.h'], |
['include', '^browser/ui/views/extensions/browser_action_drag_data.cc'], |
['include', '^browser/ui/views/extensions/browser_action_drag_data.h'], |
['include', '^browser/ui/views/extensions/browser_action_overflow_menu_controller.cc'], |
@@ -4133,30 +4127,15 @@ |
['include', '^browser/ui/views/location_bar/selected_keyword_view.h'], |
['include', '^browser/ui/views/location_bar/star_view.cc'], |
['include', '^browser/ui/views/location_bar/star_view.h'], |
- ['include', '^browser/ui/views/location_bar_view.cc'], |
- ['include', '^browser/ui/views/location_bar_view.h'], |
['include', '^browser/ui/views/notifications/balloon_view_host.cc'], |
['include', '^browser/ui/views/notifications/balloon_view_host.h'], |
['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'], |
['include', '^browser/ui/views/omnibox/omnibox_view_views.h'], |
['include', '^browser/ui/views/page_info_bubble_view.cc'], |
- ['include', '^browser/ui/views/panel_controller.cc'], |
- ['include', '^browser/ui/views/panel_controller.h'], |
- ['include', '^browser/ui/views/panels/panel_container.cc'], |
- ['include', '^browser/ui/views/panels/panel_container.h'], |
- ['include', '^browser/ui/views/panels/panel_scroller.cc'], |
- ['include', '^browser/ui/views/panels/panel_scroller.h'], |
- # Not necessary unless you're trying to build ChromeOS+views. |
- #['include', '^browser/ui/views/panels/panel_scroller_container.cc'], |
- #['include', '^browser/ui/views/panels/panel_scroller_container.h'], |
- ['include', '^browser/ui/views/panels/panel_scroller_header.cc'], |
- ['include', '^browser/ui/views/panels/panel_scroller_header.h'], |
['include', '^browser/ui/views/pinned_contents_info_bubble.cc'], |
['include', '^browser/ui/views/pinned_contents_info_bubble.h'], |
['include', '^browser/ui/views/profile_menu_button.cc'], |
['include', '^browser/ui/views/profile_menu_button.h'], |
- ['include', '^browser/ui/views/profile_menu_model.cc'], |
- ['include', '^browser/ui/views/profile_menu_model.h'], |
['include', '^browser/ui/views/profile_tag_view.cc'], |
['include', '^browser/ui/views/profile_tag_view.h'], |
['include', '^browser/ui/views/reload_button.cc'], |
@@ -4190,8 +4169,6 @@ |
['include', '^browser/ui/views/tabs/base_tab.h'], |
['include', '^browser/ui/views/tabs/base_tab_strip.cc'], |
['include', '^browser/ui/views/tabs/base_tab_strip.h'], |
- ['include', '^browser/ui/views/tabs/browser_tab_strip.cc'], |
- ['include', '^browser/ui/views/tabs/browser_tab_strip.h'], |
['include', '^browser/ui/views/tabs/browser_tab_strip_controller.cc'], |
['include', '^browser/ui/views/tabs/browser_tab_strip_controller.h'], |
['include', '^browser/ui/views/tabs/dragged_tab_controller.cc'], |
@@ -4212,8 +4189,6 @@ |
['include', '^browser/ui/views/tabs/tab_renderer_data.h'], |
['include', '^browser/ui/views/tabs/tab_strip.cc'], |
['include', '^browser/ui/views/tabs/tab_strip.h'], |
- ['include', '^browser/ui/views/tabs/tab_strip_2.cc'], |
- ['include', '^browser/ui/views/tabs/tab_strip_2.h'], |
['include', '^browser/ui/views/tabs/tab_strip_factory.cc'], |
['include', '^browser/ui/views/tabs/tab_strip_factory.h'], |
['include', '^browser/ui/views/textfield_views.cc'], |
@@ -4228,8 +4203,6 @@ |
['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'], |
['include', '^browser/ui/views/update_recommended_message_box.cc'], |
['include', '^browser/ui/views/update_recommended_message_box.h'], |
- ['include', '^browser/ui/views/view_text_utils.cc'], |
- ['include', '^browser/ui/views/view_text_utils.h'], |
['include', '^browser/ui/views/window.cc'], |
['include', '^browser/ui/views/window.h'], |
['include', '^browser/ui/views/wrench_menu.cc'], |
@@ -4242,7 +4215,8 @@ |
['exclude', '^browser/autocomplete/autocomplete_popup_view_gtk.h'], |
['exclude', '^browser/extensions/extension_host_mac.h'], |
['exclude', '^browser/extensions/extension_host_mac.mm'], |
- ['exclude', '^browser/extensions/external_registry_extension_provider_win.cc'], |
+ ['exclude', '^browser/extensions/external_registry_extension_loader_win.cc'], |
+ ['exclude', '^browser/extensions/external_registry_extension_loader_win.h'], |
['exclude', '^browser/speech/speech_input_bubble_gtk.cc'], |
['exclude', '^browser/tab_contents/render_view_context_menu_gtk.cc'], |
['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'], |
@@ -4297,8 +4271,6 @@ |
['include', '^browser/printing/print_dialog_gtk.h'], |
['exclude', '^browser/bookmarks/bookmark_drop_info.cc'], |
['exclude', '^browser/ui/browser_list_stub.cc'], |
- ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.cc'], |
- ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.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'], |
@@ -4395,13 +4367,8 @@ |
'browser/accessibility/browser_accessibility_win.h', |
'browser/aeropeek_manager.cc', |
'browser/autocomplete/autocomplete_accessibility.cc', |
- 'browser/bookmarks/bookmark_menu_controller.cc', |
- 'browser/bookmarks/bookmark_menu_controller.h', |
'browser/extensions/extension_tts_api_win.cc', |
'browser/google/google_update.cc', |
- 'browser/history/history_indexer.idl', |
- 'browser/history_tab_ui.cc', |
- 'browser/history_view.cc', |
'browser/importer/ie_importer.cc', |
], |
}], |