diff options
Diffstat (limited to 'chrome/browser')
49 files changed, 70 insertions, 71 deletions
diff --git a/chrome/browser/app_modal_dialog_gtk.cc b/chrome/browser/app_modal_dialog_gtk.cc index 99ea2f5..1ffbd39 100644 --- a/chrome/browser/app_modal_dialog_gtk.cc +++ b/chrome/browser/app_modal_dialog_gtk.cc @@ -7,11 +7,11 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/common/message_box_flags.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/app_modal_dialog_mac.mm b/chrome/browser/app_modal_dialog_mac.mm index 6df038f..26c1dcf 100644 --- a/chrome/browser/app_modal_dialog_mac.mm +++ b/chrome/browser/app_modal_dialog_mac.mm @@ -7,8 +7,8 @@ #import <Cocoa/Cocoa.h> #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/sys_string_conversions.h" -#include "chrome/common/message_box_flags.h" #include "grit/generated_resources.h" // Helper object that receives the notification that the dialog/sheet is diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 70df68c..e544f76 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -9,6 +9,7 @@ #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" +#include "app/os_exchange_data.h" #include "base/base_drag_source.h" #include "base/base_drop_target.h" #include "base/basictypes.h" @@ -35,7 +36,6 @@ #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/gfx/utils.h" #include "chrome/common/notification_service.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" #include "chrome/views/focus/focus_util_win.h" #include "googleurl/src/url_util.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index ec2284f..395e02e 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -4,6 +4,7 @@ #include "chrome/browser/automation/automation_provider.h" +#include "app/message_box_flags.h" #include "base/file_version_info.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -29,7 +30,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/message_box_flags.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/platform_util.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc index b64562e..4b3bdb6 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data.cc @@ -4,6 +4,12 @@ #include "chrome/browser/bookmarks/bookmark_drag_data.h" +// TODO(port): Port this file. +#if defined(OS_WIN) +#include "app/os_exchange_data.h" +#else +#include "chrome/common/temp_scaffolding_stubs.h" +#endif #include "base/basictypes.h" #include "base/pickle.h" #include "base/string_util.h" @@ -11,12 +17,6 @@ #include "chrome/browser/profile.h" #include "chrome/common/url_constants.h" -// TODO(port): Port this file. -#if defined(OS_WIN) -#include "chrome/common/os_exchange_data.h" -#else -#include "chrome/common/temp_scaffolding_stubs.h" -#endif #if defined(OS_WIN) static CLIPFORMAT clipboard_format = 0; diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc index c952471..1d1e1f2 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/os_exchange_data.h" #include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/test/testing_profile.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/bookmarks/bookmark_menu_controller.cc b/chrome/browser/bookmarks/bookmark_menu_controller.cc index 4376c92..7f90a52 100644 --- a/chrome/browser/bookmarks/bookmark_menu_controller.cc +++ b/chrome/browser/bookmarks/bookmark_menu_controller.cc @@ -5,6 +5,7 @@ #include "chrome/browser/bookmarks/bookmark_menu_controller.h" #include "app/l10n_util.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -12,7 +13,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/views/event_utils.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/page_transition_types.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 80a9fbd..201b063 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -4,7 +4,14 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "app/drag_drop_types.h" #include "app/l10n_util.h" +// TODO(port): Port these files. +#if defined(OS_WIN) +#include "app/os_exchange_data.h" +#else +#include "chrome/common/temp_scaffolding_stubs.h" +#endif #include "base/basictypes.h" #include "base/string_util.h" #include "base/time.h" @@ -16,7 +23,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -25,13 +31,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -// TODO(port): Port these files. -#if defined(OS_WIN) -#include "chrome/common/os_exchange_data.h" -#else -#include "chrome/common/temp_scaffolding_stubs.h" -#endif - using base::Time; namespace { diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 2c6e77f..5dc8c26 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -10,6 +10,7 @@ #include "chrome/browser/browser_main_win.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/win_util.h" @@ -18,7 +19,6 @@ #include "chrome/browser/views/uninstall_dialog.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" -#include "chrome/common/message_box_flags.h" #include "chrome/common/result_codes.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc index 7df2490..677cab7 100644 --- a/chrome/browser/download/download_request_dialog_delegate_win.cc +++ b/chrome/browser/download/download_request_dialog_delegate_win.cc @@ -5,9 +5,9 @@ #include "chrome/browser/download/download_request_dialog_delegate_win.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index b5269d1..f5589b84 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -10,6 +10,7 @@ #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "base/file_util.h" @@ -19,7 +20,6 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/drag_utils.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/views/view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index a715492..8bb7949 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -11,13 +11,13 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" #include "app/l10n_util.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/gfx/gdi_util.h" #include "base/gfx/point.h" #include "base/string_util.h" #include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/text_button.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc index fda769c..3cf5af5 100644 --- a/chrome/browser/fav_icon_helper.cc +++ b/chrome/browser/fav_icon_helper.cc @@ -6,6 +6,7 @@ #include "build/build_config.h" +#include "app/gfx/favicon_size.h" #include "base/gfx/png_decoder.h" #include "base/gfx/png_encoder.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -13,7 +14,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/favicon_size.h" #include "skia/ext/image_operations.h" FavIconHelper::FavIconHelper(TabContents* tab_contents) diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc index 0fe2b79..d01bd55 100644 --- a/chrome/browser/gtk/info_bubble_gtk.cc +++ b/chrome/browser/gtk/info_bubble_gtk.cc @@ -6,11 +6,11 @@ #include <gtk/gtk.h> +#include "app/gfx/path.h" #include "base/basictypes.h" #include "base/gfx/gtk_util.h" #include "base/gfx/rect.h" #include "base/logging.h" -#include "chrome/common/gfx/path.h" namespace { diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc index cb873b0..2215015 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_gtk.cc @@ -4,11 +4,11 @@ #include "chrome/browser/gtk/tabs/tab_gtk.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/menu_gtk.h" -#include "chrome/common/gfx/path.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index 5004e5e..99dbe40 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -7,6 +7,7 @@ #include <windows.h> #include <shellapi.h> +#include "app/gfx/icon_util.h" #include "base/file_util.h" #include "base/gfx/size.h" #include "base/message_loop.h" @@ -15,7 +16,6 @@ #include "base/task.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" -#include "chrome/common/gfx/icon_util.h" #include "SkBitmap.h" diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 333ad8c..2209541 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -7,6 +7,7 @@ #include <map> #include <set> +#include "app/gfx/favicon_size.h" #include "app/l10n_util.h" #include "base/file_util.h" #include "base/gfx/png_encoder.h" @@ -28,7 +29,6 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/tab_contents/site_instance.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/common/gfx/favicon_size.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/jsmessage_box_handler.cc b/chrome/browser/jsmessage_box_handler.cc index 41edfec..061e469 100644 --- a/chrome/browser/jsmessage_box_handler.cc +++ b/chrome/browser/jsmessage_box_handler.cc @@ -5,13 +5,13 @@ #include "chrome/browser/jsmessage_box_handler.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "build/build_config.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/message_box_flags.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index 61b8da8..9e9a5c9 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -4,6 +4,7 @@ #include "chrome/browser/search_engines/template_url.h" +#include "app/gfx/favicon_size.h" #include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" @@ -11,7 +12,6 @@ #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/common/gfx/favicon_size.h" #include "net/base/escape.h" // The TemplateURLRef has any number of terms that need to be replaced. Each of diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc index 8ea2160..79c3b85 100644 --- a/chrome/browser/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/tab_contents/tab_contents_view_win.cc @@ -7,6 +7,7 @@ #include <windows.h> #include "app/gfx/chrome_canvas.h" +#include "app/os_exchange_data.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful. #include "chrome/browser/browser_process.h" @@ -22,7 +23,6 @@ #include "chrome/browser/tab_contents/web_drag_source.h" #include "chrome/browser/tab_contents/web_drop_target.h" #include "chrome/browser/views/sad_tab_view.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/url_constants.h" #include "chrome/views/focus/view_storage.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/tab_contents/web_drop_target.cc b/chrome/browser/tab_contents/web_drop_target.cc index 7f9cbf7..bad7e1d 100644 --- a/chrome/browser/tab_contents/web_drop_target.cc +++ b/chrome/browser/tab_contents/web_drop_target.cc @@ -7,11 +7,11 @@ #include "chrome/browser/tab_contents/web_drop_target.h" +#include "app/os_exchange_data.h" #include "base/clipboard_util.h" #include "base/gfx/point.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/os_exchange_data.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "webkit/glue/webdropdata.h" diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index 49c4473..b13ac31 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -4,6 +4,9 @@ #include "chrome/browser/task_manager_resource_providers.h" +#if defined(OS_WIN) +#include "app/gfx/icon_util.h" +#endif // defined(OS_WIN) #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" @@ -21,9 +24,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/child_process_host.h" #include "chrome/common/notification_service.h" -#if defined(OS_WIN) -#include "chrome/common/gfx/icon_util.h" -#endif // defined(OS_WIN) #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index e4401f7..a44f792 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/message_box_flags.h" #include "base/file_util.h" #include "base/platform_thread.h" #include "chrome/browser/automation/url_request_mock_http_job.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/message_box_flags.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 70efbc9..f7e8aaa 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -7,14 +7,14 @@ #include <dwmapi.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/insets.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" #include "chrome/common/gfx/color_utils.h" -#include "chrome/common/gfx/insets.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h index aa40435..4fd599d 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h @@ -10,6 +10,7 @@ #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" #include "chrome/views/view.h" +#include "webkit/glue/window_open_disposition.h" class AutocompleteEditModel; class AutocompleteEditViewWin; diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc index baf9903..469561e 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" +#include "app/gfx/insets.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" -#include "chrome/common/gfx/insets.h" #include "chrome/common/win_util.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index 3d8bf6b..c6db1c6 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -13,13 +13,13 @@ #include <math.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 19dfa90..82e532b 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -8,6 +8,7 @@ #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/base_drag_source.h" @@ -28,7 +29,6 @@ #include "chrome/browser/views/event_utils.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/bookmark_folder_tree_view.cc b/chrome/browser/views/bookmark_folder_tree_view.cc index 3e79ffe..7986d8f 100644 --- a/chrome/browser/views/bookmark_folder_tree_view.cc +++ b/chrome/browser/views/bookmark_folder_tree_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/bookmark_folder_tree_view.h" +#include "app/drag_drop_types.h" +#include "app/os_exchange_data.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" #include "chrome/browser/profile.h" -#include "chrome/common/drag_drop_types.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/views/view_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc index 4ac62e9..e92e5bb 100644 --- a/chrome/browser/views/bookmark_menu_button.cc +++ b/chrome/browser/views/bookmark_menu_button.cc @@ -5,12 +5,12 @@ #include "chrome/browser/views/bookmark_menu_button.h" #include "app/resource_bundle.h" +#include "app/os_exchange_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/view_ids.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/views/widget/widget.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index d3da5e8..12d1d9f 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -4,16 +4,16 @@ #include "chrome/browser/views/bookmark_table_view.h" +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_table_model.h" #include "chrome/browser/profile.h" -#include "chrome/common/drag_drop_types.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/view_constants.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index a99eb60..cdcd078 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -6,6 +6,7 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/rect.h" @@ -19,7 +20,6 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc index 57c9bef..2d60738 100644 --- a/chrome/browser/views/external_protocol_dialog.cc +++ b/chrome/browser/views/external_protocol_dialog.cc @@ -5,6 +5,7 @@ #include "chrome/browser/views/external_protocol_dialog.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/histogram.h" #include "base/registry.h" #include "base/string_util.h" @@ -13,7 +14,6 @@ #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/frame/browser_root_view.cc b/chrome/browser/views/frame/browser_root_view.cc index c404b2c..78f6ef0 100644 --- a/chrome/browser/views/frame/browser_root_view.cc +++ b/chrome/browser/views/frame/browser_root_view.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/frame/browser_root_view.h" +#include "app/drag_drop_types.h" +#include "app/os_exchange_data.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/common/drag_drop_types.h" -#include "chrome/common/os_exchange_data.h" BrowserRootView::BrowserRootView(views::Widget* widget) : views::RootView(widget), diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 880f011..fad5dd1 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -4,8 +4,10 @@ #include "chrome/browser/views/frame/browser_view.h" +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_version_info.h" @@ -47,9 +49,7 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/common/notification_service.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 56c1d17..4958b13 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -6,12 +6,12 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/chrome_font.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index fb048b3..ebe2e93 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -12,7 +12,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/result_codes.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 8fe97d8..38e36f75 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -5,11 +5,11 @@ #include "chrome/browser/views/info_bubble.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/path.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" -#include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc index 3375af2..fab95a4 100644 --- a/chrome/browser/views/jsmessage_box_dialog.cc +++ b/chrome/browser/views/jsmessage_box_dialog.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/jsmessage_box_dialog.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc index b50424a..1c5faa6 100644 --- a/chrome/browser/views/new_profile_dialog.cc +++ b/chrome/browser/views/new_profile_dialog.cc @@ -7,10 +7,10 @@ #include <string> #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/logging.h" #include "base/file_util.h" #include "chrome/browser/user_data_manager.h" -#include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/controls/text_field.h" #include "chrome/views/view.h" diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index cccbf69..5e84ef3e 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -5,13 +5,13 @@ #include "chrome/browser/views/options/advanced_page_view.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/views/options/advanced_contents_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/message_box_flags.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/message_box_view.h" diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc index a1bd302..13618fd 100644 --- a/chrome/browser/views/repost_form_warning_view.cc +++ b/chrome/browser/views/repost_form_warning_view.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/repost_form_warning_view.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/common/message_box_flags.h" #include "chrome/common/notification_service.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc index 3624f5c..bffbb82 100644 --- a/chrome/browser/views/restart_message_box.cc +++ b/chrome/browser/views/restart_message_box.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/restart_message_box.h" #include "app/l10n_util.h" -#include "chrome/common/message_box_flags.h" +#include "app/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 0ae41cc..578c917 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -8,13 +8,13 @@ #include <shellapi.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/favicon_size.h" +#include "app/gfx/icon_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/favicon_size.h" -#include "chrome/common/gfx/icon_util.h" #include "grit/theme_resources.h" static bool g_initialized = false; diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index 0ed0368..f2193dc 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -5,10 +5,10 @@ #include "chrome/browser/views/tabs/tab.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" -#include "chrome/common/gfx/path.h" #include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index ec487aa..fce1297 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -4,8 +4,11 @@ #include "chrome/browser/views/tabs/tab_strip.h" +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/path.h" #include "app/l10n_util.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/gfx/size.h" @@ -18,9 +21,6 @@ #include "chrome/browser/views/tabs/dragged_tab_controller.h" #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/path.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 333cc6c..6d0f02b 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -6,8 +6,10 @@ #include <string> +#include "app/drag_drop_types.h" #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" +#include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/logging.h" @@ -33,9 +35,7 @@ #include "chrome/browser/view_ids.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/drag_drop_types.h" #include "chrome/common/notification_service.h" -#include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/uninstall_dialog.cc b/chrome/browser/views/uninstall_dialog.cc index 59ff2d5..f9b2c04 100644 --- a/chrome/browser/views/uninstall_dialog.cc +++ b/chrome/browser/views/uninstall_dialog.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/uninstall_dialog.h" #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/message_loop.h" #include "chrome/common/result_codes.h" -#include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc index c670ce8..7c30c85 100644 --- a/chrome/browser/views/user_data_dir_dialog.cc +++ b/chrome/browser/views/user_data_dir_dialog.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "app/l10n_util.h" +#include "app/message_box_flags.h" #include "base/logging.h" #include "chrome/browser/views/user_data_dir_dialog.h" -#include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/window.h" |