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

Unified Diff: chrome/chrome_browser.gypi

Issue 6251001: Move chrome/browser/gtk/ to chrome/browser/ui/gtk/... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/view_id_util_browsertest.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
===================================================================
--- chrome/chrome_browser.gypi (revision 71352)
+++ chrome/chrome_browser.gypi (working copy)
@@ -1330,252 +1330,252 @@
'browser/gpu_process_host.h',
'browser/gpu_process_host_ui_shim.cc',
'browser/gpu_process_host_ui_shim.h',
- 'browser/gtk/about_chrome_dialog.cc',
- 'browser/gtk/about_chrome_dialog.h',
- 'browser/gtk/accelerators_gtk.cc',
- 'browser/gtk/accelerators_gtk.h',
- 'browser/gtk/accessibility_event_router_gtk.cc',
- 'browser/gtk/accessibility_event_router_gtk.h',
- 'browser/gtk/accessible_widget_helper_gtk.cc',
- 'browser/gtk/accessible_widget_helper_gtk.h',
- 'browser/gtk/back_forward_button_gtk.cc',
- 'browser/gtk/back_forward_button_gtk.h',
- 'browser/gtk/bookmark_bar_gtk.cc',
- 'browser/gtk/bookmark_bar_gtk.h',
- 'browser/gtk/bookmark_bar_instructions_gtk.cc',
- 'browser/gtk/bookmark_bar_instructions_gtk.h',
- 'browser/gtk/bookmark_bubble_gtk.cc',
- 'browser/gtk/bookmark_bubble_gtk.h',
- 'browser/gtk/bookmark_editor_gtk.cc',
- 'browser/gtk/bookmark_editor_gtk.h',
- 'browser/gtk/bookmark_menu_controller_gtk.cc',
- 'browser/gtk/bookmark_menu_controller_gtk.h',
- 'browser/gtk/bookmark_tree_model.cc',
- 'browser/gtk/bookmark_tree_model.h',
- 'browser/gtk/bookmark_utils_gtk.cc',
- 'browser/gtk/bookmark_utils_gtk.h',
- 'browser/gtk/browser_actions_toolbar_gtk.cc',
- 'browser/gtk/browser_actions_toolbar_gtk.h',
- 'browser/gtk/browser_titlebar.cc',
- 'browser/gtk/browser_titlebar.h',
- 'browser/gtk/browser_toolbar_gtk.cc',
- 'browser/gtk/browser_toolbar_gtk.h',
- 'browser/gtk/browser_window_factory_gtk.cc',
- 'browser/gtk/browser_window_gtk.cc',
- 'browser/gtk/browser_window_gtk.h',
- 'browser/gtk/cairo_cached_surface.cc',
- 'browser/gtk/cairo_cached_surface.h',
- 'browser/gtk/certificate_dialogs.cc',
- 'browser/gtk/certificate_dialogs.h',
- 'browser/gtk/certificate_viewer.cc',
- 'browser/gtk/certificate_viewer.h',
- 'browser/gtk/chrome_gtk_frame.cc',
- 'browser/gtk/chrome_gtk_frame.h',
- 'browser/gtk/clear_browsing_data_dialog_gtk.cc',
- 'browser/gtk/clear_browsing_data_dialog_gtk.h',
- 'browser/gtk/collected_cookies_gtk.cc',
- 'browser/gtk/collected_cookies_gtk.h',
- 'browser/gtk/constrained_html_delegate_gtk.cc',
- 'browser/gtk/constrained_window_gtk.cc',
- 'browser/gtk/constrained_window_gtk.h',
- 'browser/gtk/content_setting_bubble_gtk.cc',
- 'browser/gtk/content_setting_bubble_gtk.h',
- 'browser/gtk/gconf_titlebar_listener.cc',
- 'browser/gtk/gconf_titlebar_listener.h',
- 'browser/gtk/gtk_chrome_cookie_view.cc',
- 'browser/gtk/gtk_chrome_cookie_view.h',
- 'browser/gtk/create_application_shortcuts_dialog_gtk.cc',
- 'browser/gtk/create_application_shortcuts_dialog_gtk.h',
- 'browser/gtk/custom_button.cc',
- 'browser/gtk/custom_button.h',
- 'browser/gtk/custom_drag.cc',
- 'browser/gtk/custom_drag.h',
- 'browser/gtk/dialogs_gtk.cc',
- 'browser/gtk/download_in_progress_dialog_gtk.cc',
- 'browser/gtk/download_in_progress_dialog_gtk.h',
- 'browser/gtk/download_item_gtk.cc',
- 'browser/gtk/download_item_gtk.h',
- 'browser/gtk/download_shelf_gtk.cc',
- 'browser/gtk/download_shelf_gtk.h',
- 'browser/gtk/download_started_animation_gtk.cc',
- 'browser/gtk/edit_search_engine_dialog.cc',
- 'browser/gtk/edit_search_engine_dialog.h',
- 'browser/gtk/extension_infobar_gtk.cc',
- 'browser/gtk/extension_infobar_gtk.h',
- 'browser/gtk/extension_install_prompt_gtk.cc',
- 'browser/gtk/extension_install_prompt2_gtk.cc',
- 'browser/gtk/extension_installed_bubble_gtk.cc',
- 'browser/gtk/extension_installed_bubble_gtk.h',
- 'browser/gtk/extension_view_gtk.cc',
- 'browser/gtk/extension_view_gtk.h',
- 'browser/gtk/extension_popup_gtk.cc',
- 'browser/gtk/extension_popup_gtk.h',
- 'browser/gtk/external_protocol_dialog_gtk.cc',
- 'browser/gtk/external_protocol_dialog_gtk.h',
- 'browser/gtk/find_bar_gtk.cc',
- 'browser/gtk/find_bar_gtk.h',
- 'browser/gtk/first_run_bubble.cc',
- 'browser/gtk/first_run_bubble.h',
- 'browser/gtk/first_run_dialog.cc',
- 'browser/gtk/first_run_dialog.h',
- 'browser/gtk/focus_store_gtk.cc',
- 'browser/gtk/focus_store_gtk.h',
- 'browser/gtk/fullscreen_exit_bubble_gtk.cc',
- 'browser/gtk/fullscreen_exit_bubble_gtk.h',
- 'browser/gtk/gtk_chrome_button.cc',
- 'browser/gtk/gtk_chrome_button.h',
- 'browser/gtk/gtk_chrome_link_button.cc',
- 'browser/gtk/gtk_chrome_link_button.h',
- 'browser/gtk/gtk_chrome_shrinkable_hbox.cc',
- 'browser/gtk/gtk_chrome_shrinkable_hbox.h',
- 'browser/gtk/gtk_custom_menu.cc',
- 'browser/gtk/gtk_custom_menu.h',
- 'browser/gtk/gtk_custom_menu_item.cc',
- 'browser/gtk/gtk_custom_menu_item.h',
- 'browser/gtk/gtk_expanded_container.cc',
- 'browser/gtk/gtk_expanded_container.h',
- 'browser/gtk/gtk_floating_container.cc',
- 'browser/gtk/gtk_floating_container.h',
- 'browser/gtk/gtk_theme_provider.cc',
- 'browser/gtk/gtk_theme_provider.h',
- 'browser/gtk/gtk_tree.cc',
- 'browser/gtk/gtk_tree.h',
- 'browser/gtk/gtk_util.cc',
- 'browser/gtk/gtk_util.h',
- 'browser/gtk/hover_controller_gtk.cc',
- 'browser/gtk/hover_controller_gtk.h',
- 'browser/gtk/html_dialog_gtk.cc',
- 'browser/gtk/html_dialog_gtk.h',
- 'browser/gtk/hung_renderer_dialog_gtk.cc',
- 'browser/gtk/import_dialog_gtk.cc',
- 'browser/gtk/import_dialog_gtk.h',
- 'browser/gtk/import_lock_dialog_gtk.cc',
- 'browser/gtk/import_lock_dialog_gtk.h',
- 'browser/gtk/import_progress_dialog_gtk.cc',
- 'browser/gtk/import_progress_dialog_gtk.h',
- 'browser/gtk/info_bubble_gtk.cc',
- 'browser/gtk/info_bubble_gtk.h',
- 'browser/gtk/info_bubble_accelerators_gtk.cc',
- 'browser/gtk/info_bubble_accelerators_gtk.h',
- 'browser/gtk/infobar_arrow_model.cc',
- 'browser/gtk/infobar_arrow_model.h',
- 'browser/gtk/infobar_container_gtk.cc',
- 'browser/gtk/infobar_container_gtk.h',
- 'browser/gtk/infobar_gtk.cc',
- 'browser/gtk/infobar_gtk.h',
- 'browser/gtk/instant_confirm_dialog_gtk.cc',
- 'browser/gtk/instant_confirm_dialog_gtk.h',
- 'browser/gtk/js_modal_dialog_gtk.cc',
- 'browser/gtk/js_modal_dialog_gtk.h',
- 'browser/gtk/keyword_editor_view.cc',
- 'browser/gtk/keyword_editor_view.h',
- 'browser/gtk/location_bar_view_gtk.cc',
- 'browser/gtk/location_bar_view_gtk.h',
- 'browser/gtk/menu_bar_helper.cc',
- 'browser/gtk/menu_bar_helper.h',
- 'browser/gtk/menu_gtk.cc',
- 'browser/gtk/menu_gtk.h',
- 'browser/gtk/nine_box.cc',
- 'browser/gtk/nine_box.h',
- 'browser/gtk/notifications/balloon_view_gtk.cc',
- 'browser/gtk/notifications/balloon_view_gtk.h',
- 'browser/gtk/notifications/balloon_view_host_gtk.cc',
- 'browser/gtk/notifications/balloon_view_host_gtk.h',
- 'browser/gtk/options/advanced_contents_gtk.cc',
- 'browser/gtk/options/advanced_contents_gtk.h',
- 'browser/gtk/options/advanced_page_gtk.cc',
- 'browser/gtk/options/advanced_page_gtk.h',
- 'browser/gtk/options/content_exception_editor.cc',
- 'browser/gtk/options/content_exception_editor.h',
- 'browser/gtk/options/content_exceptions_window_gtk.cc',
- 'browser/gtk/options/content_exceptions_window_gtk.h',
- 'browser/gtk/options/content_filter_page_gtk.cc',
- 'browser/gtk/options/content_filter_page_gtk.h',
- 'browser/gtk/options/content_page_gtk.cc',
- 'browser/gtk/options/content_page_gtk.h',
- 'browser/gtk/options/content_settings_window_gtk.cc',
- 'browser/gtk/options/content_settings_window_gtk.h',
- 'browser/gtk/options/cookie_filter_page_gtk.cc',
- 'browser/gtk/options/cookie_filter_page_gtk.h',
- 'browser/gtk/options/cookies_view.cc',
- 'browser/gtk/options/cookies_view.h',
- 'browser/gtk/options/fonts_languages_window_gtk.cc',
- 'browser/gtk/options/fonts_page_gtk.cc',
- 'browser/gtk/options/fonts_page_gtk.h',
- 'browser/gtk/options/general_page_gtk.cc',
- 'browser/gtk/options/general_page_gtk.h',
- 'browser/gtk/options/languages_page_gtk.cc',
- 'browser/gtk/options/languages_page_gtk.h',
- 'browser/gtk/options/managed_prefs_banner_gtk.cc',
- 'browser/gtk/options/managed_prefs_banner_gtk.h',
- 'browser/gtk/options/options_layout_gtk.cc',
- 'browser/gtk/options/options_layout_gtk.h',
- 'browser/gtk/options/options_window_gtk.cc',
- 'browser/gtk/options/passwords_exceptions_page_gtk.cc',
- 'browser/gtk/options/passwords_exceptions_page_gtk.h',
- 'browser/gtk/options/passwords_exceptions_window_gtk.cc',
- 'browser/gtk/options/passwords_exceptions_window_gtk.h',
- 'browser/gtk/options/passwords_page_gtk.cc',
- 'browser/gtk/options/passwords_page_gtk.h',
- 'browser/gtk/options/simple_content_exceptions_window.cc',
- 'browser/gtk/options/simple_content_exceptions_window.h',
- 'browser/gtk/options/url_picker_dialog_gtk.cc',
- 'browser/gtk/options/url_picker_dialog_gtk.h',
- 'browser/gtk/overflow_button.cc',
- 'browser/gtk/overflow_button.h',
- 'browser/gtk/owned_widget_gtk.cc',
- 'browser/gtk/owned_widget_gtk.h',
- 'browser/gtk/page_info_bubble_gtk.cc',
- 'browser/gtk/pk11_password_dialog.cc',
- 'browser/gtk/process_singleton_dialog.cc',
- 'browser/gtk/process_singleton_dialog.h',
- 'browser/gtk/reload_button_gtk.cc',
- 'browser/gtk/reload_button_gtk.h',
- 'browser/gtk/repost_form_warning_gtk.cc',
- 'browser/gtk/repost_form_warning_gtk.h',
- 'browser/gtk/rounded_window.cc',
- 'browser/gtk/rounded_window.h',
- 'browser/gtk/sad_tab_gtk.cc',
- 'browser/gtk/sad_tab_gtk.h',
- 'browser/gtk/slide_animator_gtk.cc',
- 'browser/gtk/slide_animator_gtk.h',
- 'browser/gtk/ssl_client_certificate_selector.cc',
- 'browser/gtk/status_bubble_gtk.cc',
- 'browser/gtk/status_bubble_gtk.h',
- 'browser/gtk/status_icons/status_icon_gtk.h',
- 'browser/gtk/status_icons/status_icon_gtk.cc',
- 'browser/gtk/status_icons/status_tray_gtk.h',
- 'browser/gtk/status_icons/status_tray_gtk.cc',
- 'browser/gtk/tab_contents_container_gtk.cc',
- 'browser/gtk/tab_contents_container_gtk.h',
- 'browser/gtk/tab_contents_drag_source.cc',
- 'browser/gtk/tab_contents_drag_source.h',
- 'browser/gtk/tabs/dragged_tab_controller_gtk.cc',
- 'browser/gtk/tabs/dragged_tab_controller_gtk.h',
- 'browser/gtk/tabs/dragged_tab_gtk.cc',
- 'browser/gtk/tabs/dragged_tab_gtk.h',
- 'browser/gtk/tabs/tab_gtk.cc',
- 'browser/gtk/tabs/tab_gtk.h',
- 'browser/gtk/tabs/tab_renderer_gtk.cc',
- 'browser/gtk/tabs/tab_renderer_gtk.h',
- 'browser/gtk/tabs/tab_strip_gtk.cc',
- 'browser/gtk/tabs/tab_strip_gtk.h',
- 'browser/gtk/task_manager_gtk.cc',
- 'browser/gtk/task_manager_gtk.h',
- 'browser/gtk/theme_install_bubble_view_gtk.cc',
- 'browser/gtk/theme_install_bubble_view_gtk.h',
- 'browser/gtk/translate/after_translate_infobar_gtk.cc',
- 'browser/gtk/translate/after_translate_infobar_gtk.h',
- 'browser/gtk/translate/before_translate_infobar_gtk.cc',
- 'browser/gtk/translate/before_translate_infobar_gtk.h',
- 'browser/gtk/translate/translate_infobar_base_gtk.cc',
- 'browser/gtk/translate/translate_infobar_base_gtk.h',
- 'browser/gtk/translate/translate_message_infobar_gtk.cc',
- 'browser/gtk/translate/translate_message_infobar_gtk.h',
- 'browser/gtk/update_recommended_dialog.cc',
- 'browser/gtk/update_recommended_dialog.h',
- 'browser/gtk/view_id_util.cc',
- 'browser/gtk/view_id_util.h',
+ 'browser/ui/gtk/about_chrome_dialog.cc',
+ 'browser/ui/gtk/about_chrome_dialog.h',
+ 'browser/ui/gtk/accelerators_gtk.cc',
+ 'browser/ui/gtk/accelerators_gtk.h',
+ 'browser/ui/gtk/accessibility_event_router_gtk.cc',
+ 'browser/ui/gtk/accessibility_event_router_gtk.h',
+ 'browser/ui/gtk/accessible_widget_helper_gtk.cc',
+ 'browser/ui/gtk/accessible_widget_helper_gtk.h',
+ 'browser/ui/gtk/back_forward_button_gtk.cc',
+ 'browser/ui/gtk/back_forward_button_gtk.h',
+ 'browser/ui/gtk/bookmark_bar_gtk.cc',
+ 'browser/ui/gtk/bookmark_bar_gtk.h',
+ 'browser/ui/gtk/bookmark_bar_instructions_gtk.cc',
+ 'browser/ui/gtk/bookmark_bar_instructions_gtk.h',
+ 'browser/ui/gtk/bookmark_bubble_gtk.cc',
+ 'browser/ui/gtk/bookmark_bubble_gtk.h',
+ 'browser/ui/gtk/bookmark_editor_gtk.cc',
+ 'browser/ui/gtk/bookmark_editor_gtk.h',
+ 'browser/ui/gtk/bookmark_menu_controller_gtk.cc',
+ 'browser/ui/gtk/bookmark_menu_controller_gtk.h',
+ 'browser/ui/gtk/bookmark_tree_model.cc',
+ 'browser/ui/gtk/bookmark_tree_model.h',
+ 'browser/ui/gtk/bookmark_utils_gtk.cc',
+ 'browser/ui/gtk/bookmark_utils_gtk.h',
+ 'browser/ui/gtk/browser_actions_toolbar_gtk.cc',
+ 'browser/ui/gtk/browser_actions_toolbar_gtk.h',
+ 'browser/ui/gtk/browser_titlebar.cc',
+ 'browser/ui/gtk/browser_titlebar.h',
+ 'browser/ui/gtk/browser_toolbar_gtk.cc',
+ 'browser/ui/gtk/browser_toolbar_gtk.h',
+ 'browser/ui/gtk/browser_window_factory_gtk.cc',
+ 'browser/ui/gtk/browser_window_gtk.cc',
+ 'browser/ui/gtk/browser_window_gtk.h',
+ 'browser/ui/gtk/cairo_cached_surface.cc',
+ 'browser/ui/gtk/cairo_cached_surface.h',
+ 'browser/ui/gtk/certificate_dialogs.cc',
+ 'browser/ui/gtk/certificate_dialogs.h',
+ 'browser/ui/gtk/certificate_viewer.cc',
+ 'browser/ui/gtk/certificate_viewer.h',
+ 'browser/ui/gtk/chrome_gtk_frame.cc',
+ 'browser/ui/gtk/chrome_gtk_frame.h',
+ 'browser/ui/gtk/clear_browsing_data_dialog_gtk.cc',
+ 'browser/ui/gtk/clear_browsing_data_dialog_gtk.h',
+ 'browser/ui/gtk/collected_cookies_gtk.cc',
+ 'browser/ui/gtk/collected_cookies_gtk.h',
+ 'browser/ui/gtk/constrained_html_delegate_gtk.cc',
+ 'browser/ui/gtk/constrained_window_gtk.cc',
+ 'browser/ui/gtk/constrained_window_gtk.h',
+ 'browser/ui/gtk/content_setting_bubble_gtk.cc',
+ 'browser/ui/gtk/content_setting_bubble_gtk.h',
+ 'browser/ui/gtk/gconf_titlebar_listener.cc',
+ 'browser/ui/gtk/gconf_titlebar_listener.h',
+ 'browser/ui/gtk/gtk_chrome_cookie_view.cc',
+ 'browser/ui/gtk/gtk_chrome_cookie_view.h',
+ 'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
+ 'browser/ui/gtk/create_application_shortcuts_dialog_gtk.h',
+ 'browser/ui/gtk/custom_button.cc',
+ 'browser/ui/gtk/custom_button.h',
+ 'browser/ui/gtk/custom_drag.cc',
+ 'browser/ui/gtk/custom_drag.h',
+ 'browser/ui/gtk/dialogs_gtk.cc',
+ 'browser/ui/gtk/download_in_progress_dialog_gtk.cc',
+ 'browser/ui/gtk/download_in_progress_dialog_gtk.h',
+ 'browser/ui/gtk/download_item_gtk.cc',
+ 'browser/ui/gtk/download_item_gtk.h',
+ 'browser/ui/gtk/download_shelf_gtk.cc',
+ 'browser/ui/gtk/download_shelf_gtk.h',
+ 'browser/ui/gtk/download_started_animation_gtk.cc',
+ 'browser/ui/gtk/edit_search_engine_dialog.cc',
+ 'browser/ui/gtk/edit_search_engine_dialog.h',
+ 'browser/ui/gtk/extension_infobar_gtk.cc',
+ 'browser/ui/gtk/extension_infobar_gtk.h',
+ 'browser/ui/gtk/extension_install_prompt_gtk.cc',
+ 'browser/ui/gtk/extension_install_prompt2_gtk.cc',
+ 'browser/ui/gtk/extension_installed_bubble_gtk.cc',
+ 'browser/ui/gtk/extension_installed_bubble_gtk.h',
+ 'browser/ui/gtk/extension_view_gtk.cc',
+ 'browser/ui/gtk/extension_view_gtk.h',
+ 'browser/ui/gtk/extension_popup_gtk.cc',
+ 'browser/ui/gtk/extension_popup_gtk.h',
+ 'browser/ui/gtk/external_protocol_dialog_gtk.cc',
+ 'browser/ui/gtk/external_protocol_dialog_gtk.h',
+ 'browser/ui/gtk/find_bar_gtk.cc',
+ 'browser/ui/gtk/find_bar_gtk.h',
+ 'browser/ui/gtk/first_run_bubble.cc',
+ 'browser/ui/gtk/first_run_bubble.h',
+ 'browser/ui/gtk/first_run_dialog.cc',
+ 'browser/ui/gtk/first_run_dialog.h',
+ 'browser/ui/gtk/focus_store_gtk.cc',
+ 'browser/ui/gtk/focus_store_gtk.h',
+ 'browser/ui/gtk/fullscreen_exit_bubble_gtk.cc',
+ 'browser/ui/gtk/fullscreen_exit_bubble_gtk.h',
+ 'browser/ui/gtk/gtk_chrome_button.cc',
+ 'browser/ui/gtk/gtk_chrome_button.h',
+ 'browser/ui/gtk/gtk_chrome_link_button.cc',
+ 'browser/ui/gtk/gtk_chrome_link_button.h',
+ 'browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc',
+ 'browser/ui/gtk/gtk_chrome_shrinkable_hbox.h',
+ 'browser/ui/gtk/gtk_custom_menu.cc',
+ 'browser/ui/gtk/gtk_custom_menu.h',
+ 'browser/ui/gtk/gtk_custom_menu_item.cc',
+ 'browser/ui/gtk/gtk_custom_menu_item.h',
+ 'browser/ui/gtk/gtk_expanded_container.cc',
+ 'browser/ui/gtk/gtk_expanded_container.h',
+ 'browser/ui/gtk/gtk_floating_container.cc',
+ 'browser/ui/gtk/gtk_floating_container.h',
+ 'browser/ui/gtk/gtk_theme_provider.cc',
+ 'browser/ui/gtk/gtk_theme_provider.h',
+ 'browser/ui/gtk/gtk_tree.cc',
+ 'browser/ui/gtk/gtk_tree.h',
+ 'browser/ui/gtk/gtk_util.cc',
+ 'browser/ui/gtk/gtk_util.h',
+ 'browser/ui/gtk/hover_controller_gtk.cc',
+ 'browser/ui/gtk/hover_controller_gtk.h',
+ 'browser/ui/gtk/html_dialog_gtk.cc',
+ 'browser/ui/gtk/html_dialog_gtk.h',
+ 'browser/ui/gtk/hung_renderer_dialog_gtk.cc',
+ 'browser/ui/gtk/import_dialog_gtk.cc',
+ 'browser/ui/gtk/import_dialog_gtk.h',
+ 'browser/ui/gtk/import_lock_dialog_gtk.cc',
+ 'browser/ui/gtk/import_lock_dialog_gtk.h',
+ 'browser/ui/gtk/import_progress_dialog_gtk.cc',
+ 'browser/ui/gtk/import_progress_dialog_gtk.h',
+ 'browser/ui/gtk/info_bubble_gtk.cc',
+ 'browser/ui/gtk/info_bubble_gtk.h',
+ 'browser/ui/gtk/info_bubble_accelerators_gtk.cc',
+ 'browser/ui/gtk/info_bubble_accelerators_gtk.h',
+ 'browser/ui/gtk/infobar_arrow_model.cc',
+ 'browser/ui/gtk/infobar_arrow_model.h',
+ 'browser/ui/gtk/infobar_container_gtk.cc',
+ 'browser/ui/gtk/infobar_container_gtk.h',
+ 'browser/ui/gtk/infobar_gtk.cc',
+ 'browser/ui/gtk/infobar_gtk.h',
+ 'browser/ui/gtk/instant_confirm_dialog_gtk.cc',
+ 'browser/ui/gtk/instant_confirm_dialog_gtk.h',
+ 'browser/ui/gtk/js_modal_dialog_gtk.cc',
+ 'browser/ui/gtk/js_modal_dialog_gtk.h',
+ 'browser/ui/gtk/keyword_editor_view.cc',
+ 'browser/ui/gtk/keyword_editor_view.h',
+ 'browser/ui/gtk/location_bar_view_gtk.cc',
+ 'browser/ui/gtk/location_bar_view_gtk.h',
+ 'browser/ui/gtk/menu_bar_helper.cc',
+ 'browser/ui/gtk/menu_bar_helper.h',
+ 'browser/ui/gtk/menu_gtk.cc',
+ 'browser/ui/gtk/menu_gtk.h',
+ 'browser/ui/gtk/nine_box.cc',
+ 'browser/ui/gtk/nine_box.h',
+ 'browser/ui/gtk/notifications/balloon_view_gtk.cc',
+ 'browser/ui/gtk/notifications/balloon_view_gtk.h',
+ 'browser/ui/gtk/notifications/balloon_view_host_gtk.cc',
+ 'browser/ui/gtk/notifications/balloon_view_host_gtk.h',
+ 'browser/ui/gtk/options/advanced_contents_gtk.cc',
+ 'browser/ui/gtk/options/advanced_contents_gtk.h',
+ 'browser/ui/gtk/options/advanced_page_gtk.cc',
+ 'browser/ui/gtk/options/advanced_page_gtk.h',
+ 'browser/ui/gtk/options/content_exception_editor.cc',
+ 'browser/ui/gtk/options/content_exception_editor.h',
+ 'browser/ui/gtk/options/content_exceptions_window_gtk.cc',
+ 'browser/ui/gtk/options/content_exceptions_window_gtk.h',
+ 'browser/ui/gtk/options/content_filter_page_gtk.cc',
+ 'browser/ui/gtk/options/content_filter_page_gtk.h',
+ 'browser/ui/gtk/options/content_page_gtk.cc',
+ 'browser/ui/gtk/options/content_page_gtk.h',
+ 'browser/ui/gtk/options/content_settings_window_gtk.cc',
+ 'browser/ui/gtk/options/content_settings_window_gtk.h',
+ 'browser/ui/gtk/options/cookie_filter_page_gtk.cc',
+ 'browser/ui/gtk/options/cookie_filter_page_gtk.h',
+ 'browser/ui/gtk/options/cookies_view.cc',
+ 'browser/ui/gtk/options/cookies_view.h',
+ 'browser/ui/gtk/options/fonts_languages_window_gtk.cc',
+ 'browser/ui/gtk/options/fonts_page_gtk.cc',
+ 'browser/ui/gtk/options/fonts_page_gtk.h',
+ 'browser/ui/gtk/options/general_page_gtk.cc',
+ 'browser/ui/gtk/options/general_page_gtk.h',
+ 'browser/ui/gtk/options/languages_page_gtk.cc',
+ 'browser/ui/gtk/options/languages_page_gtk.h',
+ 'browser/ui/gtk/options/managed_prefs_banner_gtk.cc',
+ 'browser/ui/gtk/options/managed_prefs_banner_gtk.h',
+ 'browser/ui/gtk/options/options_layout_gtk.cc',
+ 'browser/ui/gtk/options/options_layout_gtk.h',
+ 'browser/ui/gtk/options/options_window_gtk.cc',
+ 'browser/ui/gtk/options/passwords_exceptions_page_gtk.cc',
+ 'browser/ui/gtk/options/passwords_exceptions_page_gtk.h',
+ 'browser/ui/gtk/options/passwords_exceptions_window_gtk.cc',
+ 'browser/ui/gtk/options/passwords_exceptions_window_gtk.h',
+ 'browser/ui/gtk/options/passwords_page_gtk.cc',
+ 'browser/ui/gtk/options/passwords_page_gtk.h',
+ 'browser/ui/gtk/options/simple_content_exceptions_window.cc',
+ 'browser/ui/gtk/options/simple_content_exceptions_window.h',
+ 'browser/ui/gtk/options/url_picker_dialog_gtk.cc',
+ 'browser/ui/gtk/options/url_picker_dialog_gtk.h',
+ 'browser/ui/gtk/overflow_button.cc',
+ 'browser/ui/gtk/overflow_button.h',
+ 'browser/ui/gtk/owned_widget_gtk.cc',
+ 'browser/ui/gtk/owned_widget_gtk.h',
+ 'browser/ui/gtk/page_info_bubble_gtk.cc',
+ 'browser/ui/gtk/pk11_password_dialog.cc',
+ 'browser/ui/gtk/process_singleton_dialog.cc',
+ 'browser/ui/gtk/process_singleton_dialog.h',
+ 'browser/ui/gtk/reload_button_gtk.cc',
+ 'browser/ui/gtk/reload_button_gtk.h',
+ 'browser/ui/gtk/repost_form_warning_gtk.cc',
+ 'browser/ui/gtk/repost_form_warning_gtk.h',
+ 'browser/ui/gtk/rounded_window.cc',
+ 'browser/ui/gtk/rounded_window.h',
+ 'browser/ui/gtk/sad_tab_gtk.cc',
+ 'browser/ui/gtk/sad_tab_gtk.h',
+ 'browser/ui/gtk/slide_animator_gtk.cc',
+ 'browser/ui/gtk/slide_animator_gtk.h',
+ 'browser/ui/gtk/ssl_client_certificate_selector.cc',
+ 'browser/ui/gtk/status_bubble_gtk.cc',
+ 'browser/ui/gtk/status_bubble_gtk.h',
+ 'browser/ui/gtk/status_icons/status_icon_gtk.h',
+ 'browser/ui/gtk/status_icons/status_icon_gtk.cc',
+ 'browser/ui/gtk/status_icons/status_tray_gtk.h',
+ 'browser/ui/gtk/status_icons/status_tray_gtk.cc',
+ 'browser/ui/gtk/tab_contents_container_gtk.cc',
+ 'browser/ui/gtk/tab_contents_container_gtk.h',
+ 'browser/ui/gtk/tab_contents_drag_source.cc',
+ 'browser/ui/gtk/tab_contents_drag_source.h',
+ 'browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc',
+ 'browser/ui/gtk/tabs/dragged_tab_controller_gtk.h',
+ 'browser/ui/gtk/tabs/dragged_tab_gtk.cc',
+ 'browser/ui/gtk/tabs/dragged_tab_gtk.h',
+ 'browser/ui/gtk/tabs/tab_gtk.cc',
+ 'browser/ui/gtk/tabs/tab_gtk.h',
+ 'browser/ui/gtk/tabs/tab_renderer_gtk.cc',
+ 'browser/ui/gtk/tabs/tab_renderer_gtk.h',
+ 'browser/ui/gtk/tabs/tab_strip_gtk.cc',
+ 'browser/ui/gtk/tabs/tab_strip_gtk.h',
+ 'browser/ui/gtk/task_manager_gtk.cc',
+ 'browser/ui/gtk/task_manager_gtk.h',
+ 'browser/ui/gtk/theme_install_bubble_view_gtk.cc',
+ 'browser/ui/gtk/theme_install_bubble_view_gtk.h',
+ 'browser/ui/gtk/translate/after_translate_infobar_gtk.cc',
+ 'browser/ui/gtk/translate/after_translate_infobar_gtk.h',
+ 'browser/ui/gtk/translate/before_translate_infobar_gtk.cc',
+ 'browser/ui/gtk/translate/before_translate_infobar_gtk.h',
+ 'browser/ui/gtk/translate/translate_infobar_base_gtk.cc',
+ 'browser/ui/gtk/translate/translate_infobar_base_gtk.h',
+ 'browser/ui/gtk/translate/translate_message_infobar_gtk.cc',
+ 'browser/ui/gtk/translate/translate_message_infobar_gtk.h',
+ 'browser/ui/gtk/update_recommended_dialog.cc',
+ 'browser/ui/gtk/update_recommended_dialog.h',
+ 'browser/ui/gtk/view_id_util.cc',
+ 'browser/ui/gtk/view_id_util.h',
'browser/hang_monitor/hung_plugin_action.cc',
'browser/hang_monitor/hung_plugin_action.h',
'browser/hang_monitor/hung_window_detector.cc',
@@ -3567,8 +3567,8 @@
}],
['use_gconf==0', {
'sources!': [
- 'browser/gtk/gconf_titlebar_listener.cc',
- 'browser/gtk/gconf_titlebar_listener.h',
+ 'browser/ui/gtk/gconf_titlebar_listener.cc',
+ 'browser/ui/gtk/gconf_titlebar_listener.h',
],
}],
['use_gnome_keyring==0', {
@@ -4160,80 +4160,79 @@
['include', '^browser/ui/views/wrench_menu.h'],
['include', '^browser/ui/window_sizer.cc'],
['include', '^browser/ui/window_sizer.h'],
- # Exclude all of browser/gtk, then include the things we want.
- ['exclude', '^browser/gtk'],
- ['include', '^browser/gtk/accessibility_event_router_gtk.cc'],
- ['include', '^browser/gtk/accessibility_event_router_gtk.h'],
- ['include', '^browser/gtk/accessible_widget_helper_gtk.cc'],
- ['include', '^browser/gtk/accessible_widget_helper_gtk.h'],
- ['include', '^browser/gtk/bookmark_editor_gtk.cc'],
- ['include', '^browser/gtk/bookmark_editor_gtk.h'],
- ['include', '^browser/gtk/bookmark_tree_model.cc'],
- ['include', '^browser/gtk/bookmark_tree_model.h'],
- ['include', '^browser/gtk/bookmark_utils_gtk.cc'],
- ['include', '^browser/gtk/bookmark_utils_gtk.h'],
- ['include', '^browser/gtk/cairo_cached_surface.cc'],
- ['include', '^browser/gtk/cairo_cached_surface.h'],
- ['include', '^browser/gtk/clear_browsing_data_dialog_gtk.cc'],
- ['include', '^browser/gtk/clear_browsing_data_dialog_gtk.h'],
- ['include', '^browser/gtk/certificate_dialogs.cc'],
- ['include', '^browser/gtk/certificate_dialogs.h'],
- ['include', '^browser/gtk/certificate_viewer.cc'],
- ['include', '^browser/gtk/certificate_viewer.h'],
- ['include', '^browser/gtk/chrome_gtk_frame.cc'],
- ['include', '^browser/gtk/chrome_gtk_frame.h'],
- ['include', '^browser/gtk/collected_cookies_gtk.cc'],
- ['include', '^browser/gtk/collected_cookies_gtk.h'],
- ['include', '^browser/gtk/constrained_window_gtk.cc'],
- ['include', '^browser/gtk/constrained_window_gtk.h'],
- ['include', '^browser/gtk/gtk_chrome_cookie_view.cc'],
- ['include', '^browser/gtk/gtk_chrome_cookie_view.h'],
- ['include', '^browser/gtk/download_started_animation_gtk.cc'],
- ['include', '^browser/gtk/edit_search_engine_dialog.cc'],
- ['include', '^browser/gtk/edit_search_engine_dialog.h'],
- ['include', '^browser/gtk/first_run_dialog.cc'],
- ['include', '^browser/gtk/first_run_dialog.h'],
- ['include', '^browser/gtk/gtk_chrome_button.cc'],
- ['include', '^browser/gtk/gtk_chrome_button.h'],
- ['include', '^browser/gtk/gtk_chrome_link_button.cc'],
- ['include', '^browser/gtk/gtk_chrome_link_button.h'],
- ['include', '^browser/gtk/gtk_custom_menu_item.cc'],
- ['include', '^browser/gtk/gtk_floating_container.cc'],
- ['include', '^browser/gtk/gtk_floating_container.h'],
- ['include', '^browser/gtk/gtk_theme_provider.cc'],
- ['include', '^browser/gtk/gtk_theme_provider.h'],
- ['include', '^browser/gtk/gtk_tree.cc'],
- ['include', '^browser/gtk/gtk_tree.h'],
- ['include', '^browser/gtk/gtk_util.cc'],
- ['include', '^browser/gtk/gtk_util.h'],
- ['include', '^browser/gtk/hover_controller_gtk.cc'],
- ['include', '^browser/gtk/hover_controller_gtk.h'],
- ['include', '^browser/gtk/hung_renderer_dialog_gtk.cc'],
- ['include', '^browser/gtk/import_dialog_gtk.cc'],
- ['include', '^browser/gtk/import_dialog_gtk.h'],
- ['include', '^browser/gtk/import_progress_dialog_gtk.cc'],
- ['include', '^browser/gtk/import_progress_dialog_gtk.h'],
- ['include', '^browser/gtk/import_lock_dialog_gtk.cc'],
- ['include', '^browser/gtk/import_lock_dialog_gtk.h'],
- ['include', '^browser/gtk/keyword_editor_view.cc'],
- ['include', '^browser/gtk/keyword_editor_view.h'],
- ['include', '^browser/gtk/nine_box.cc'],
- ['include', '^browser/gtk/nine_box.h'],
- ['include', '^browser/gtk/options/'],
- ['include', '^browser/gtk/owned_widget_gtk.cc'],
- ['include', '^browser/gtk/owned_widget_gtk.h'],
- ['include', '^browser/gtk/pk11_password_dialog.cc'],
- ['include', '^browser/gtk/pk11_password_dialog.h'],
- ['include', '^browser/gtk/popup_blocked_animation_gtk.cc'],
- ['include', '^browser/gtk/repost_form_warning_gtk.cc'],
- ['include', '^browser/gtk/repost_form_warning_gtk.h'],
- ['include', '^browser/gtk/ssl_client_certificate_selector.cc'],
- ['include', '^browser/gtk/tab_contents_drag_source.cc'],
- ['include', '^browser/gtk/tab_contents_drag_source.h'],
- ['include', '^browser/gtk/task_manager_gtk.cc'],
- ['include', '^browser/gtk/task_manager_gtk.h'],
- ['include', '^browser/gtk/view_id_util.cc'],
- ['include', '^browser/gtk/view_id_util.h'],
+ # Exclude all of browser/ui/gtk, then include the things we want.
+ ['exclude', '^browser/ui/gtk'],
+ ['include', '^browser/ui/gtk/accessibility_event_router_gtk.cc'],
+ ['include', '^browser/ui/gtk/accessibility_event_router_gtk.h'],
+ ['include', '^browser/ui/gtk/accessible_widget_helper_gtk.cc'],
+ ['include', '^browser/ui/gtk/accessible_widget_helper_gtk.h'],
+ ['include', '^browser/ui/gtk/bookmark_editor_gtk.cc'],
+ ['include', '^browser/ui/gtk/bookmark_editor_gtk.h'],
+ ['include', '^browser/ui/gtk/bookmark_tree_model.cc'],
+ ['include', '^browser/ui/gtk/bookmark_tree_model.h'],
+ ['include', '^browser/ui/gtk/bookmark_utils_gtk.cc'],
+ ['include', '^browser/ui/gtk/bookmark_utils_gtk.h'],
+ ['include', '^browser/ui/gtk/cairo_cached_surface.cc'],
+ ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
+ ['include', '^browser/ui/gtk/clear_browsing_data_dialog_gtk.cc'],
+ ['include', '^browser/ui/gtk/clear_browsing_data_dialog_gtk.h'],
+ ['include', '^browser/ui/gtk/certificate_dialogs.cc'],
+ ['include', '^browser/ui/gtk/certificate_dialogs.h'],
+ ['include', '^browser/ui/gtk/certificate_viewer.cc'],
+ ['include', '^browser/ui/gtk/certificate_viewer.h'],
+ ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
+ ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
+ ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'],
+ ['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/gtk_chrome_cookie_view.cc'],
+ ['include', '^browser/ui/gtk/gtk_chrome_cookie_view.h'],
+ ['include', '^browser/ui/gtk/download_started_animation_gtk.cc'],
+ ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
+ ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
+ ['include', '^browser/ui/gtk/first_run_dialog.cc'],
+ ['include', '^browser/ui/gtk/first_run_dialog.h'],
+ ['include', '^browser/ui/gtk/gtk_chrome_button.cc'],
+ ['include', '^browser/ui/gtk/gtk_chrome_button.h'],
+ ['include', '^browser/ui/gtk/gtk_chrome_link_button.cc'],
+ ['include', '^browser/ui/gtk/gtk_chrome_link_button.h'],
+ ['include', '^browser/ui/gtk/gtk_custom_menu_item.cc'],
+ ['include', '^browser/ui/gtk/gtk_floating_container.cc'],
+ ['include', '^browser/ui/gtk/gtk_floating_container.h'],
+ ['include', '^browser/ui/gtk/gtk_theme_provider.cc'],
+ ['include', '^browser/ui/gtk/gtk_theme_provider.h'],
+ ['include', '^browser/ui/gtk/gtk_tree.cc'],
+ ['include', '^browser/ui/gtk/gtk_tree.h'],
+ ['include', '^browser/ui/gtk/gtk_util.cc'],
+ ['include', '^browser/ui/gtk/gtk_util.h'],
+ ['include', '^browser/ui/gtk/hover_controller_gtk.cc'],
+ ['include', '^browser/ui/gtk/hover_controller_gtk.h'],
+ ['include', '^browser/ui/gtk/hung_renderer_dialog_gtk.cc'],
+ ['include', '^browser/ui/gtk/import_dialog_gtk.cc'],
+ ['include', '^browser/ui/gtk/import_dialog_gtk.h'],
+ ['include', '^browser/ui/gtk/import_progress_dialog_gtk.cc'],
+ ['include', '^browser/ui/gtk/import_progress_dialog_gtk.h'],
+ ['include', '^browser/ui/gtk/import_lock_dialog_gtk.cc'],
+ ['include', '^browser/ui/gtk/import_lock_dialog_gtk.h'],
+ ['include', '^browser/ui/gtk/keyword_editor_view.cc'],
+ ['include', '^browser/ui/gtk/keyword_editor_view.h'],
+ ['include', '^browser/ui/gtk/nine_box.cc'],
+ ['include', '^browser/ui/gtk/nine_box.h'],
+ ['include', '^browser/ui/gtk/options/'],
+ ['include', '^browser/ui/gtk/owned_widget_gtk.cc'],
+ ['include', '^browser/ui/gtk/owned_widget_gtk.h'],
+ ['include', '^browser/ui/gtk/pk11_password_dialog.cc'],
+ ['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'],
+ ['include', '^browser/ui/gtk/tab_contents_drag_source.cc'],
+ ['include', '^browser/ui/gtk/tab_contents_drag_source.h'],
+ ['include', '^browser/ui/gtk/task_manager_gtk.cc'],
+ ['include', '^browser/ui/gtk/task_manager_gtk.h'],
+ ['include', '^browser/ui/gtk/view_id_util.cc'],
+ ['include', '^browser/ui/gtk/view_id_util.h'],
# Other excluded stuff.
['exclude', '^browser/autocomplete/autocomplete_popup_view_gtk.cc'],
@@ -4262,9 +4261,9 @@
# non-ChromeOS views Linux builds.
['OS=="linux" and toolkit_views==1 and chromeos==0', {
'sources/': [
- ['include', '^browser/gtk/dialogs_gtk.cc'],
- ['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
- ['include', '^browser/gtk/external_protocol_dialog_gtk.h'],
+ ['include', '^browser/ui/gtk/dialogs_gtk.cc'],
+ ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.cc'],
+ ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.h'],
['include', '^browser/ui/views/notifications/balloon_view.cc'],
['include', '^browser/ui/views/notifications/balloon_view.h'],
['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
@@ -4293,8 +4292,8 @@
['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
# TODO(anicolao): exclude these once we have DOMUI dialogs
- # ['exclude', '^browser/gtk/constrained_window_gtk.cc'],
- # ['exclude', '^browser/gtk/constrained_window_gtk.h'],
+ # ['exclude', '^browser/ui/gtk/constrained_window_gtk.cc'],
+ # ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'],
],
}],
['OS=="linux" and chromeos==1',{
« no previous file with comments | « chrome/browser/ui/gtk/view_id_util_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698