diff options
Diffstat (limited to 'chrome/browser')
42 files changed, 51 insertions, 61 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 7a2ce8b..88facc6 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -10,6 +10,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/os_exchange_data.h" +#include "app/win_util.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/win_util.h" #include "googleurl/src/url_util.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index e0b4aad..955a3af 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -60,6 +60,7 @@ #include <windows.h> #include <shellapi.h> +#include "app/win_util.h" #include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_url_handler.h" @@ -75,8 +76,6 @@ #include "chrome/browser/views/location_bar_view.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/child_process_host.h" -#include "chrome/common/win_util.h" - #endif // OS_WIN using base::TimeDelta; diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 9824586..28b8144 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -69,6 +69,7 @@ #include <windows.h> #include <shellapi.h> +#include "app/win_util.h" #include "base/registry.h" #include "base/win_util.h" #include "chrome/browser/browser.h" @@ -83,7 +84,6 @@ #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/views/user_data_dir_dialog.h" #include "chrome/common/env_vars.h" -#include "chrome/common/win_util.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 28c849b..b86df5f 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -2,15 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/win_util.h" +#include "chrome/browser/browser_main_win.h" -#include <shellapi.h> #include <windows.h> - -#include "chrome/browser/browser_main_win.h" +#include <shellapi.h> #include "app/l10n_util.h" #include "app/message_box_flags.h" +#include "app/win_util.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/win_util.h" diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc index 6a93398..069fc58 100644 --- a/chrome/browser/download/download_file.cc +++ b/chrome/browser/download/download_file.cc @@ -24,7 +24,7 @@ #include "net/url_request/url_request_context.h" #if defined(OS_WIN) -#include "chrome/common/win_util.h" +#include "app/win_util.h" #include "chrome/common/win_safe_util.h" #elif defined(OS_MACOSX) #include "chrome/common/quarantine_mac.h" diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 0081a2d..a037fa01 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -42,11 +42,11 @@ #include "net/url_request/url_request_context.h" #if defined(OS_WIN) +#include "app/win_util.h" // TODO(port): some of these need porting. #include "base/registry.h" #include "base/win_util.h" #include "chrome/browser/download/download_util.h" -#include "chrome/common/win_util.h" #endif #if defined(OS_LINUX) diff --git a/chrome/browser/download/save_file.cc b/chrome/browser/download/save_file.cc index 5ee2ab8..cb83a87 100644 --- a/chrome/browser/download/save_file.cc +++ b/chrome/browser/download/save_file.cc @@ -11,7 +11,6 @@ #include "base/string_util.h" #include "chrome/browser/download/save_types.h" #if defined(OS_WIN) -#include "chrome/common/win_util.h" #include "chrome/common/win_safe_util.h" #endif diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index d9af3ea..85c3003 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -38,11 +38,6 @@ #include "net/url_request/url_request_context.h" #include "webkit/glue/dom_serializer_delegate.h" -#if defined(OS_WIN) -#include "base/win_util.h" -#include "chrome/common/win_util.h" -#endif - using base::Time; // This structure is for storing parameters which we will use to create a diff --git a/chrome/browser/extensions/extension_error_reporter.cc b/chrome/browser/extensions/extension_error_reporter.cc index 8a17f26..c3a028c 100644 --- a/chrome/browser/extensions/extension_error_reporter.cc +++ b/chrome/browser/extensions/extension_error_reporter.cc @@ -4,11 +4,10 @@ #include "chrome/browser/extensions/extension_error_reporter.h" -#include "base/string_util.h" - #if defined(OS_WIN) -#include "chrome/common/win_util.h" +#include "app/win_util.h" #endif +#include "base/string_util.h" // No AddRef required when using ExtensionErrorReporter with RunnableMethod. // This is okay since the ExtensionErrorReporter is a singleton that lives until diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 339fd29..f71129e 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -4,6 +4,7 @@ #include "chrome/browser/external_tab_container.h" +#include "app/win_util.h" #include "base/logging.h" #include "base/win_util.h" #include "chrome/browser/automation/automation_provider.h" @@ -15,7 +16,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/win_util.h" #include "chrome/test/automation/automation_messages.h" // Included for SetRootViewForHWND. #include "views/widget/widget_win.h" diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc index 82d5fc9..5bed393 100644 --- a/chrome/browser/hang_monitor/hung_plugin_action.cc +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc @@ -7,9 +7,9 @@ #include "chrome/browser/hang_monitor/hung_plugin_action.h" #include "app/l10n_util.h" +#include "app/win_util.h" #include "base/win_util.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc index c595659..1003b90 100644 --- a/chrome/browser/importer/firefox_importer_utils.cc +++ b/chrome/browser/importer/firefox_importer_utils.cc @@ -8,8 +8,10 @@ #if defined(OS_WIN) #include <shlobj.h> -#endif +#include "app/win_util.h" +#include "base/registry.h" +#endif #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" @@ -20,10 +22,6 @@ #include "googleurl/src/gurl.h" #include "net/base/base64.h" -#if defined(OS_WIN) -#include "base/registry.h" -#include "chrome/common/win_util.h" -#endif namespace { diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index dde6c19..fe27b12 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -13,6 +13,7 @@ #include <algorithm> #include "app/l10n_util.h" +#include "app/win_util.h" #include "base/file_util.h" #include "base/registry.h" #include "base/string_util.h" @@ -23,7 +24,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "chrome/common/win_util.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index c97e9e1..66aa8ed 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -9,6 +9,9 @@ #include "app/gfx/favicon_size.h" #include "app/l10n_util.h" +#if defined(OS_WIN) +#include "app/win_util.h" +#endif #include "base/file_util.h" #include "base/gfx/png_encoder.h" #include "base/string_util.h" @@ -39,7 +42,6 @@ // TODO(port): Port these files. #if defined(OS_WIN) #include "chrome/browser/views/importer_lock_view.h" -#include "chrome/common/win_util.h" #include "views/window/window.h" #endif diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index 01b75cd..ebe23c8 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -13,6 +13,7 @@ #include <shlguid.h> #include <vector> +#include "app/win_util.h" #include "base/file_util.h" #include "base/path_service.h" #include "chrome/browser/importer/ie_importer.h" @@ -20,7 +21,6 @@ #include "chrome/browser/password_manager/ie7_password.h" #include "chrome/browser/profile.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/win_util.h" class ImporterTest : public testing::Test { public: diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 51306f3..36d01c6 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -43,9 +43,9 @@ #include "webkit/glue/plugins/plugin_constants_win.h" #if defined(OS_WIN) +#include "app/win_util.h" #include "base/win_util.h" #include "chrome/browser/sandbox_policy.h" -#include "chrome/common/win_util.h" #include "sandbox/src/sandbox.h" #endif diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc index c408513..08dc09f 100644 --- a/chrome/browser/printing/printed_document.cc +++ b/chrome/browser/printing/printed_document.cc @@ -8,6 +8,7 @@ #include "app/gfx/chrome_font.h" #include "app/gfx/text_elider.h" +#include "app/win_util.h" #include "base/message_loop.h" #include "base/time.h" #include "chrome/browser/printing/page_number.h" @@ -17,7 +18,6 @@ #include "chrome/common/gfx/emf.h" #include "chrome/common/time_format.h" #include "chrome/common/notification_service.h" -#include "chrome/common/win_util.h" #include "printing/units.h" #include "skia/ext/platform_device.h" diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index cffd597..a02becc 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -5,6 +5,7 @@ #include "chrome/browser/process_singleton.h" #include "app/l10n_util.h" +#include "app/win_util.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/process_util.h" @@ -16,7 +17,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/result_codes.h" -#include "chrome/common/win_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 0517ee3..f43e06ba 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -11,6 +11,9 @@ #include <algorithm> +#if defined(OS_WIN) +#include "app/win_util.h" +#endif #include "base/command_line.h" #include "base/linked_ptr.h" #include "base/logging.h" @@ -57,7 +60,6 @@ using WebKit::WebCache; // Once the above TODO is finished, then this block is all Windows-specific // files. #include "base/win_util.h" -#include "chrome/common/win_util.h" #include "chrome/browser/sandbox_policy.h" #include "sandbox/src/sandbox.h" #elif defined(OS_POSIX) diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index cbbbad7..7519e3d 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -20,7 +20,6 @@ #if defined(OS_WIN) #include "base/gfx/gdi_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/win_util.h" #endif // defined(OS_WIN) using base::Time; diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index ee995e0..c0c8c8d 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -26,7 +26,6 @@ #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" -#include "chrome/common/win_util.h" #include "grit/webkit_resources.h" #include "skia/ext/skia_utils_win.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" diff --git a/chrome/browser/sandbox_policy.cc b/chrome/browser/sandbox_policy.cc index 24d3c2e..32c1f44 100644 --- a/chrome/browser/sandbox_policy.cc +++ b/chrome/browser/sandbox_policy.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sandbox_policy.h" +#include "app/win_util.h" #include "base/command_line.h" #include "base/debug_util.h" #include "base/file_util.h" @@ -21,7 +22,6 @@ #include "chrome/common/debug_flags.h" #include "chrome/common/ipc_logging.h" #include "chrome/common/notification_service.h" -#include "chrome/common/win_util.h" #include "sandbox/src/sandbox.h" #include "webkit/glue/plugins/plugin_list.h" diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 9732305..0c45d56 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/shell_integration.h" + #include <windows.h> #include <shlobj.h> #include <shobjidl.h> -#include "chrome/browser/shell_integration.h" - +#include "app/win_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -17,7 +18,6 @@ #include "base/task.h" #include "base/win_util.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/win_util.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/create_reg_key_work_item.h" #include "chrome/installer/util/set_reg_value_work_item.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 8708487..0f01ea7 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -4,6 +4,9 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" +#if defined(OS_WIN) +#include "app/win_util.h" +#endif #include "app/l10n_util.h" #include "base/clipboard.h" #include "base/command_line.h" @@ -26,7 +29,6 @@ #if defined(OS_WIN) #include "chrome/browser/views/options/fonts_languages_window_view.h" #include "chrome/browser/views/page_info_window.h" -#include "chrome/common/win_util.h" #endif RenderViewContextMenu::RenderViewContextMenu( diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 2dddc6f..c133ee7 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -12,10 +12,10 @@ #include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/win_util.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/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/include/SkShader.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc index 469561e..6dfbfee 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc @@ -5,10 +5,10 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" #include "app/gfx/insets.h" +#include "app/win_util.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/win_util.h" //////////////////////////////////////////////////////////////////////////////// // AutocompletePopupWin, public: diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 5604db7..51beca0a 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -11,6 +11,7 @@ #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "base/string_util.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" @@ -31,7 +32,6 @@ #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index 41df839..d635932 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -24,7 +24,6 @@ #include "chrome/browser/views/bookmark_table_view.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index ca4f35c..cde0327 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -10,6 +10,7 @@ #include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "base/gfx/rect.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_process.h" @@ -24,7 +25,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/win_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index aa74f2fa1..915e78f 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -10,13 +10,13 @@ #include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "base/file_path.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/views/frame/browser_frame.cc b/chrome/browser/views/frame/browser_frame.cc index 60187d8..c022b6a 100644 --- a/chrome/browser/views/frame/browser_frame.cc +++ b/chrome/browser/views/frame/browser_frame.cc @@ -8,12 +8,12 @@ #include <shellapi.h> #include "app/resource_bundle.h" +#include "app/win_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/views/frame/browser_root_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/frame/glass_browser_frame_view.h" #include "chrome/browser/views/frame/opaque_browser_frame_view.h" -#include "chrome/common/win_util.h" #include "grit/theme_resources.h" #include "views/window/window_delegate.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index e1f8cc0..a3acb80 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -9,6 +9,7 @@ #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "base/command_line.h" #include "base/file_version_info.h" #include "base/time.h" @@ -54,7 +55,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/win_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index a132119..10c604c 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -9,10 +9,10 @@ #include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/win_util.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/win_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 674141c..b31a8f6 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -7,12 +7,12 @@ #include "app/gfx/chrome_canvas.h" #include "app/gfx/path.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "base/win_util.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" -#include "chrome/common/win_util.h" #include "grit/theme_resources.h" #include "views/widget/root_view.h" #include "views/window/window.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 7683626..c1354f1 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -7,6 +7,7 @@ #include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" @@ -26,7 +27,6 @@ #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/first_run_bubble.h" #include "chrome/browser/views/page_info_window.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/background.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index 2b5ab0f..593487b 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -13,7 +13,6 @@ #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/profile.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index 7f73092..b2f8a68 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -9,6 +9,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/browser_process.h" @@ -18,7 +19,6 @@ #include "chrome/browser/ssl/ssl_manager.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index 99664a1..c211660 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -14,12 +14,12 @@ #include "app/gfx/chrome_font.h" #include "app/l10n_util.h" +#include "app/win_util.h" #include "base/file_util.h" #include "base/registry.h" #include "base/string_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" // Helpers to show certain types of Windows shell dialogs in a way that doesn't diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 9bb88ae..87d0d01 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -10,11 +10,11 @@ #include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/win_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 365e000..73c19e4a 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -11,6 +11,7 @@ #include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" +#include "app/win_util.h" #include "base/gfx/size.h" #include "base/stl_util-inl.h" #include "chrome/browser/metrics/user_metrics.h" @@ -22,7 +23,6 @@ #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" -#include "chrome/common/win_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 38cc412..c3c98d2 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -37,7 +37,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/win_util.h" #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" #endif diff --git a/chrome/browser/visitedlink_master.cc b/chrome/browser/visitedlink_master.cc index c22e866..54a3a22 100644 --- a/chrome/browser/visitedlink_master.cc +++ b/chrome/browser/visitedlink_master.cc @@ -13,6 +13,9 @@ #include <algorithm> +#if defined(OS_WIN) +#include "app/win_util.h" +#endif #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" @@ -25,9 +28,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" -#if defined(OS_WIN) -#include "chrome/common/win_util.h" -#endif using file_util::ScopedFILE; using file_util::OpenFile; @@ -95,7 +95,7 @@ class AsyncWriter : public Task { // The write may not make it to the kernel (stdlib may buffer the write) // until the next fseek/fclose call. If we crash, it's easy for our used - // item count to be out of sync with the number of hashes we write. + // item count to be out of sync with the number of hashes we write. // Protect against this by calling fflush. int ret = fflush(file); DCHECK_EQ(0, ret); |