diff options
Diffstat (limited to 'chrome/views')
24 files changed, 31 insertions, 31 deletions
diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc index 9bbda74..b1c6191 100644 --- a/chrome/views/accelerator.cc +++ b/chrome/views/accelerator.cc @@ -6,9 +6,9 @@ #include <windows.h> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/controls/button/button_dropdown.cc b/chrome/views/controls/button/button_dropdown.cc index 89abf85..5598a18 100644 --- a/chrome/views/controls/button/button_dropdown.cc +++ b/chrome/views/controls/button/button_dropdown.cc @@ -4,8 +4,8 @@ #include "chrome/views/controls/button/button_dropdown.h" +#include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/menu/view_menu_delegate.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc index 9f0ec74..a4ad6aa 100644 --- a/chrome/views/controls/button/menu_button.cc +++ b/chrome/views/controls/button/menu_button.cc @@ -4,10 +4,10 @@ #include "chrome/views/controls/button/menu_button.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/menu/view_menu_delegate.h" diff --git a/chrome/views/controls/button/native_button.cc b/chrome/views/controls/button/native_button.cc index e5c1850..511f45b 100644 --- a/chrome/views/controls/button/native_button.cc +++ b/chrome/views/controls/button/native_button.cc @@ -4,8 +4,8 @@ #include "chrome/views/controls/button/native_button.h" +#include "app/l10n_util.h" #include "base/logging.h" -#include "chrome/common/l10n_util.h" namespace views { diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc index b821db9..add909b 100644 --- a/chrome/views/controls/button/text_button.cc +++ b/chrome/views/controls/button/text_button.cc @@ -4,10 +4,10 @@ #include "chrome/views/controls/button/text_button.h" +#include "app/l10n_util.h" #include "app/throb_animation.h" #include "app/resource_bundle.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/event.h" #include "grit/theme_resources.h" diff --git a/chrome/views/controls/combo_box.cc b/chrome/views/controls/combo_box.cc index eaf8a07..375dd3a7 100644 --- a/chrome/views/controls/combo_box.cc +++ b/chrome/views/controls/combo_box.cc @@ -4,12 +4,12 @@ #include "chrome/views/controls/combo_box.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "base/gfx/rect.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" // Limit how small a combobox can be. static const int kMinComboboxWidth = 148; diff --git a/chrome/views/controls/label.cc b/chrome/views/controls/label.cc index b14527e..5ef0381 100644 --- a/chrome/views/controls/label.cc +++ b/chrome/views/controls/label.cc @@ -6,6 +6,7 @@ #include <math.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" @@ -13,7 +14,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" namespace views { diff --git a/chrome/views/controls/label_unittest.cc b/chrome/views/controls/label_unittest.cc index fb1d057..b287c29 100644 --- a/chrome/views/controls/label_unittest.cc +++ b/chrome/views/controls/label_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/border.h" #include "chrome/views/controls/label.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc index cb94de3..ef398f4 100644 --- a/chrome/views/controls/menu/chrome_menu.cc +++ b/chrome/views/controls/menu/chrome_menu.cc @@ -8,6 +8,8 @@ #include <uxtheme.h> #include <Vssym32.h> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/base_drag_source.h" #include "base/gfx/native_theme.h" #include "base/message_loop.h" @@ -18,8 +20,6 @@ #include "chrome/browser/drag_utils.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/border.h" #include "chrome/views/view_constants.h" diff --git a/chrome/views/controls/menu/menu.cc b/chrome/views/controls/menu/menu.cc index 050c3fa..e46eaa0 100644 --- a/chrome/views/controls/menu/menu.cc +++ b/chrome/views/controls/menu/menu.cc @@ -12,14 +12,14 @@ #include <atlmisc.h> #include <string> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/gfx/rect.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/accelerator.h" const SkBitmap* Menu::Delegate::kEmptyIcon = 0; diff --git a/chrome/views/controls/message_box_view.cc b/chrome/views/controls/message_box_view.cc index 33f6ce4..191b78c 100644 --- a/chrome/views/controls/message_box_view.cc +++ b/chrome/views/controls/message_box_view.cc @@ -4,13 +4,13 @@ #include "chrome/views/controls/message_box_view.h" +#include "app/l10n_util.h" #include "base/clipboard.h" #include "base/message_loop.h" #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/window/client_view.h" diff --git a/chrome/views/controls/native_control.cc b/chrome/views/controls/native_control.cc index 5e07e41..84a3226 100644 --- a/chrome/views/controls/native_control.cc +++ b/chrome/views/controls/native_control.cc @@ -9,9 +9,9 @@ #include <atlcrack.h> #include <atlframe.h> +#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/win_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/notification_service.h" #include "chrome/views/background.h" #include "chrome/views/border.h" diff --git a/chrome/views/controls/native_control_win.cc b/chrome/views/controls/native_control_win.cc index eb172e9..d493f66 100644 --- a/chrome/views/controls/native_control_win.cc +++ b/chrome/views/controls/native_control_win.cc @@ -4,9 +4,9 @@ #include "chrome/views/controls/native_control_win.h" +#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/win_util.h" -#include "chrome/common/l10n_util_win.h" namespace views { diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc index 42ba4e7..da35a62 100644 --- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -4,9 +4,9 @@ #include "chrome/views/controls/scrollbar/bitmap_scroll_bar.h" +#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/menu/menu.h" #include "chrome/views/controls/scroll_view.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/views/controls/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc index 64d267b1..75d7f03 100644 --- a/chrome/views/controls/tabbed_pane.cc +++ b/chrome/views/controls/tabbed_pane.cc @@ -6,13 +6,13 @@ #include <vssym32.h> +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/background.h" #include "chrome/views/fill_layout.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/controls/table/table_view.cc b/chrome/views/controls/table/table_view.cc index 828aeae..a794e91 100644 --- a/chrome/views/controls/table/table_view.cc +++ b/chrome/views/controls/table/table_view.cc @@ -7,13 +7,13 @@ #include <algorithm> #include <windowsx.h> +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/win_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/hwnd_view.h" #include "SkBitmap.h" diff --git a/chrome/views/controls/table/table_view.h b/chrome/views/controls/table/table_view.h index ec575c7..e411d8a 100644 --- a/chrome/views/controls/table/table_view.h +++ b/chrome/views/controls/table/table_view.h @@ -16,8 +16,8 @@ #include <unicode/uchar.h> #include <vector> +#include "app/l10n_util.h" #include "base/logging.h" -#include "chrome/common/l10n_util.h" #if defined(OS_WIN) // TODO(port): remove the ifdef when native_control.h is ported. #include "chrome/views/controls/native_control.h" diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc index 5992fd3..4e61afd 100644 --- a/chrome/views/controls/text_field.cc +++ b/chrome/views/controls/text_field.cc @@ -11,6 +11,8 @@ #include <tom.h> // For ITextDocument, a COM interface to CRichEditCtrl #include <vsstyle.h> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/clipboard.h" #include "base/gfx/native_theme.h" #include "base/scoped_clipboard_writer.h" @@ -18,8 +20,6 @@ #include "base/win_util.h" #include "chrome/browser/browser_process.h" #include "chrome/common/gfx/insets.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/hwnd_view.h" diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc index e09711f..13e1914d 100644 --- a/chrome/views/controls/tree/tree_view.cc +++ b/chrome/views/controls/tree/tree_view.cc @@ -6,13 +6,13 @@ #include <shellapi.h> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/win_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/icon_util.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/widget/widget.h" #include "grit/theme_resources.h" diff --git a/chrome/views/view.cc b/chrome/views/view.cc index f509f7d..561ee70 100644 --- a/chrome/views/view.cc +++ b/chrome/views/view.cc @@ -10,13 +10,13 @@ #include <iostream> #endif +#include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_handle.h" #include "base/string_util.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/layout_manager.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/widget/aero_tooltip_manager.cc b/chrome/views/widget/aero_tooltip_manager.cc index e6ed9da..6e1a5fa 100644 --- a/chrome/views/widget/aero_tooltip_manager.cc +++ b/chrome/views/widget/aero_tooltip_manager.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/views/widget/aero_tooltip_manager.h" + #include <windows.h> #include <atlbase.h> #include <atlapp.h> // for GET_X/Y_LPARAM #include <commctrl.h> #include <shlobj.h> -#include "chrome/views/widget/aero_tooltip_manager.h" - +#include "app/l10n_util_win.h" #include "base/message_loop.h" -#include "chrome/common/l10n_util_win.h" namespace views { diff --git a/chrome/views/widget/tooltip_manager.cc b/chrome/views/widget/tooltip_manager.cc index dd63196..1584c29 100644 --- a/chrome/views/widget/tooltip_manager.cc +++ b/chrome/views/widget/tooltip_manager.cc @@ -6,10 +6,10 @@ #include <limits> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/message_loop.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/win_util.h" #include "chrome/views/view.h" diff --git a/chrome/views/window/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc index 13ee1f0..f60bd26 100644 --- a/chrome/views/window/dialog_client_view.cc +++ b/chrome/views/window/dialog_client_view.cc @@ -8,12 +8,12 @@ #include <uxtheme.h> #include <vsstyle.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc index 83e09e4..0057177 100644 --- a/chrome/views/window/window_win.cc +++ b/chrome/views/window/window_win.cc @@ -6,6 +6,7 @@ #include <shellapi.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" @@ -13,7 +14,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" |