diff options
57 files changed, 74 insertions, 72 deletions
@@ -5,8 +5,6 @@ include_rules = [ # chrome/common.
"+chrome/common/chrome_paths.h",
"+chrome/common/chrome_switches.h",
- "+chrome/common/gfx/chrome_canvas.h",
- "+chrome/common/gfx/chrome_font.h",
"+chrome/common/gtk_util.h",
# TODO(beng): l10n_util_unittest.cc:
diff --git a/app/app.vcproj b/app/app.vcproj index e4e2162..aeee826 100644 --- a/app/app.vcproj +++ b/app/app.vcproj @@ -136,6 +136,14 @@ RelativePath=".\gfx\chrome_canvas_win.cc"
>
</File>
+ <File
+ RelativePath=".\gfx\chrome_font.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gfx\chrome_font_win.cc"
+ >
+ </File>
</Filter>
<File
RelativePath=".\animation.cc"
diff --git a/app/gfx/chrome_canvas.cc b/app/gfx/chrome_canvas.cc index 886a170..dfb1936 100644 --- a/app/gfx/chrome_canvas.cc +++ b/app/gfx/chrome_canvas.cc @@ -6,11 +6,11 @@ #include <limits> +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "base/gfx/rect.h" #include "base/logging.h" #include "skia/include/SkShader.h" -#include "chrome/common/gfx/chrome_font.h" bool ChromeCanvas::GetClipRect(gfx::Rect* r) { SkRect clip; diff --git a/app/gfx/chrome_canvas_linux.cc b/app/gfx/chrome_canvas_linux.cc index 262c9db..ea5e371 100644 --- a/app/gfx/chrome_canvas_linux.cc +++ b/app/gfx/chrome_canvas_linux.cc @@ -6,10 +6,10 @@ #include <pango/pango.h> +#include "app/gfx/chrome_font.h" #include "base/gfx/rect.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_font.h" namespace { diff --git a/app/gfx/chrome_canvas_win.cc b/app/gfx/chrome_canvas_win.cc index 4a4cd6a..76ca4d7 100644 --- a/app/gfx/chrome_canvas_win.cc +++ b/app/gfx/chrome_canvas_win.cc @@ -6,10 +6,10 @@ #include <limits> +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "base/gfx/rect.h" #include "skia/include/SkShader.h" -#include "chrome/common/gfx/chrome_font.h" namespace { diff --git a/chrome/common/gfx/chrome_font.h b/app/gfx/chrome_font.h index 0358afc..3672593 100644 --- a/chrome/common/gfx/chrome_font.h +++ b/app/gfx/chrome_font.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_GFX_CHROME_FONT_H_ -#define CHROME_COMMON_GFX_CHROME_FONT_H_ +#ifndef APP_GFX_CHROME_FONT_H_ +#define APP_GFX_CHROME_FONT_H_ #include "build/build_config.h" @@ -234,4 +234,4 @@ class ChromeFont { }; -#endif // CHROME_COMMON_GFX_CHROME_FONT_H_ +#endif // APP_GFX_CHROME_FONT_H_ diff --git a/chrome/common/gfx/chrome_font_gtk.cc b/app/gfx/chrome_font_gtk.cc index f0d2120..39acf85 100644 --- a/chrome/common/gfx/chrome_font_gtk.cc +++ b/app/gfx/chrome_font_gtk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include <fontconfig/fontconfig.h> #include <gtk/gtk.h> diff --git a/chrome/common/gfx/chrome_font_mac.mm b/app/gfx/chrome_font_mac.mm index 590c54e..87605ad 100644 --- a/chrome/common/gfx/chrome_font_mac.mm +++ b/app/gfx/chrome_font_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include <Cocoa/Cocoa.h> diff --git a/chrome/common/gfx/chrome_font_skia.cc b/app/gfx/chrome_font_skia.cc index ae62a7a..87f4ad6 100644 --- a/chrome/common/gfx/chrome_font_skia.cc +++ b/app/gfx/chrome_font_skia.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "base/logging.h" #include "base/sys_string_conversions.h" diff --git a/chrome/common/gfx/chrome_font_unittest.cc b/app/gfx/chrome_font_unittest.cc index d0b61d2..5ad7973 100644 --- a/chrome/common/gfx/chrome_font_unittest.cc +++ b/app/gfx/chrome_font_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/gfx/chrome_font_win.cc b/app/gfx/chrome_font_win.cc index 71b10d8..b5ddb18 100644 --- a/chrome/common/gfx/chrome_font_win.cc +++ b/app/gfx/chrome_font_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include <windows.h> #include <math.h> diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc index 5b3c034..c3d6923 100644 --- a/app/resource_bundle.cc +++ b/app/resource_bundle.cc @@ -4,12 +4,12 @@ #include "app/resource_bundle.h" +#include "app/gfx/chrome_font.h" #include "base/gfx/png_decoder.h" #include "base/logging.h" #include "base/string_piece.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" -#include "chrome/common/gfx/chrome_font.h" #include "SkBitmap.h" ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc index 8f0660d..116ebd9 100644 --- a/app/resource_bundle_linux.cc +++ b/app/resource_bundle_linux.cc @@ -6,6 +6,7 @@ #include <gtk/gtk.h> +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "base/base_paths.h" #include "base/data_pack.h" @@ -17,7 +18,6 @@ #include "base/string_piece.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gtk_util.h" #include "SkBitmap.h" diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm index 527fe2f..710364b 100644 --- a/app/resource_bundle_mac.mm +++ b/app/resource_bundle_mac.mm @@ -6,6 +6,7 @@ #import <Foundation/Foundation.h> +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "base/base_paths.h" #include "base/data_pack.h" @@ -17,8 +18,6 @@ #include "base/string_piece.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/gfx/chrome_font.h" - ResourceBundle::~ResourceBundle() { FreeImages(); diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index 4ed32c4..f65ee2b 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -6,6 +6,7 @@ #include <atlbase.h> +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" @@ -14,7 +15,6 @@ #include "base/string_piece.h" #include "base/win_util.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/gfx/chrome_font.h" namespace { diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index ba7b57f..da73d98 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -12,12 +12,12 @@ #include <atlmisc.h> #include <tom.h> // For ITextDocument, a COM interface to CRichEditCtrl. +#include "app/gfx/chrome_font.h" #include "base/scoped_ptr.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/toolbar_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/page_transition_types.h" #include "chrome/views/controls/menu/menu.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 70e13052..a671e40 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -8,6 +8,7 @@ #include <algorithm> +#include "app/gfx/chrome_font.h" #include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/gfx/gtk_util.h" @@ -21,7 +22,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/notification_service.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc index 65b4f34..10f32b1 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc @@ -12,6 +12,7 @@ #include <cmath> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -28,7 +29,6 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/notification_service.h" #include "chrome/views/view.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.h b/chrome/browser/autocomplete/autocomplete_popup_view_win.h index afcc353..f98346d 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.h @@ -12,11 +12,11 @@ #include <string> +#include "app/gfx/chrome_font.h" #include "base/scoped_ptr.h" #include "base/win_util.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" -#include "chrome/common/gfx/chrome_font.h" #include "webkit/glue/window_open_disposition.h" class AutocompletePopupModel; diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index 2cef2ec..a715492 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -9,6 +9,7 @@ #include <shobjidl.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -16,7 +17,6 @@ #include "base/gfx/point.h" #include "base/string_util.h" #include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/text_button.h" diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc index 5697e50c..4a89aa8 100644 --- a/chrome/browser/gtk/download_item_gtk.cc +++ b/chrome/browser/gtk/download_item_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/download_item_gtk.h" +#include "app/gfx/chrome_font.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/string_util.h" @@ -13,7 +14,6 @@ #include "chrome/browser/gtk/download_shelf_gtk.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/gtk/nine_box.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/text_elider.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h index 4d576a2..74f730d 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h @@ -9,10 +9,10 @@ #include "app/animation.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/gfx/rect.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/owned_widget_gtk.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc index b42b375..902554b 100644 --- a/chrome/browser/printing/printed_document.cc +++ b/chrome/browser/printing/printed_document.cc @@ -6,13 +6,13 @@ #include <set> +#include "app/gfx/chrome_font.h" #include "base/message_loop.h" #include "base/time.h" #include "chrome/browser/printing/page_number.h" #include "chrome/browser/printing/page_overlays.h" #include "chrome/browser/printing/printed_pages_source.h" #include "chrome/browser/printing/printed_page.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/emf.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/time_format.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h index 0aa5dc0..aa40435 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ #define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ +#include "app/gfx/chrome_font.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/views/view.h" class AutocompleteEditModel; diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index 61be2b0..d3da5e8 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -5,6 +5,7 @@ #include "chrome/browser/views/bookmark_table_view.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -12,7 +13,6 @@ #include "chrome/browser/bookmarks/bookmark_table_model.h" #include "chrome/browser/profile.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index ab42c6b..a99eb60 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -5,6 +5,7 @@ #include "chrome/browser/views/constrained_window_impl.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/rect.h" @@ -18,7 +19,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/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h index 06c344a..c5df73d 100644 --- a/chrome/browser/views/download_item_view.h +++ b/chrome/browser/views/download_item_view.h @@ -18,12 +18,12 @@ #include <string> +#include "app/gfx/chrome_font.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/time.h" #include "base/timer.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/icon_manager.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 24bcc2b..56c1d17 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -5,12 +5,12 @@ #include "chrome/browser/views/frame/opaque_browser_frame_view.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.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/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/image_button.h" diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h index 883d3c3..5dac2ef 100644 --- a/chrome/browser/views/location_bar_view.h +++ b/chrome/browser/views/location_bar_view.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "app/gfx/chrome_font.h" #include "base/gfx/rect.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" @@ -16,7 +17,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/toolbar_model.h" #include "chrome/browser/views/info_bubble.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/views/controls/hwnd_view.h" #include "chrome/views/controls/image_view.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index a026b4d..fb1c57a 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -12,6 +12,7 @@ #include <vector> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -21,7 +22,6 @@ #include "chrome/browser/character_encoding.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 8337676..4752c80 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -9,6 +9,7 @@ #include "chrome/browser/views/options/languages_page_view.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -21,7 +22,6 @@ #include "chrome/browser/views/options/language_combobox_model.h" #include "chrome/browser/views/restart_message_box.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index fa4fd97..7985a41 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -8,11 +8,11 @@ #include "chrome/browser/views/options/options_group_view.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.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_font.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/separator.h" diff --git a/chrome/browser/views/sad_tab_view.h b/chrome/browser/views/sad_tab_view.h index 3013ecf..5e9415d 100644 --- a/chrome/browser/views/sad_tab_view.h +++ b/chrome/browser/views/sad_tab_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_SAD_TAB_H_ #define CHROME_BROWSER_VIEWS_SAD_TAB_H_ -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "chrome/views/view.h" class SkBitmap; diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index 35879b9..99664a1 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -12,13 +12,13 @@ #include <algorithm> #include <set> +#include "app/gfx/chrome_font.h" #include "app/l10n_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/gfx/chrome_font.h" #include "chrome/common/win_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 039954f..285ebcc 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -7,13 +7,13 @@ #include "chrome/browser/views/tabs/tab_renderer.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.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/gfx/chrome_font.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/non_client_view.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 99099a6..0da07eb 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -108,6 +108,7 @@ }, }, { + # TODO(beng): rename to 'app' when moves to top level. 'target_name': 'app_base', 'type': '<(library)', 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE', @@ -129,7 +130,12 @@ '../app/gfx/chrome_canvas.cc', '../app/gfx/chrome_canvas.h', '../app/gfx/chrome_canvas_linux.cc', - '../app/gfx/chrome_canvas_win.cc', + '../app/gfx/chrome_canvas_win.cc', + '../app/gfx/chrome_font.h', + '../app/gfx/chrome_font_gtk.cc', + '../app/gfx/chrome_font_mac.mm', + '../app/gfx/chrome_font_skia.cc', + '../app/gfx/chrome_font_win.cc', '../app/l10n_util.cc', '../app/l10n_util.h', '../app/l10n_util_posix.cc', @@ -220,11 +226,6 @@ 'common/extensions/url_pattern.h', 'common/extensions/user_script.cc', 'common/extensions/user_script.h', - 'common/gfx/chrome_font.h', - 'common/gfx/chrome_font_gtk.cc', - 'common/gfx/chrome_font_mac.mm', - 'common/gfx/chrome_font_skia.cc', - 'common/gfx/chrome_font_win.cc', 'common/gfx/color_utils.cc', 'common/gfx/color_utils.h', 'common/gfx/emf.cc', @@ -2495,7 +2496,7 @@ 'common/extensions/url_pattern_unittest.cc', 'common/extensions/user_script_unittest.cc', 'common/file_descriptor_set_unittest.cc', - 'common/gfx/chrome_font_unittest.cc', + '../app/gfx/chrome_font_unittest.cc', 'common/gfx/emf_unittest.cc', 'common/gfx/icon_util_unittest.cc', 'common/gfx/text_elider_unittest.cc', diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index f8b4613..d359d59 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -149,14 +149,6 @@ Name="gfx" > <File - RelativePath=".\gfx\chrome_font.h" - > - </File> - <File - RelativePath=".\gfx\chrome_font_win.cc" - > - </File> - <File RelativePath=".\gfx\color_utils.cc" > </File> diff --git a/chrome/common/gfx/text_elider.cc b/chrome/common/gfx/text_elider.cc index e25f19c..1b0303f 100644 --- a/chrome/common/gfx/text_elider.cc +++ b/chrome/common/gfx/text_elider.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/gfx/chrome_font.h" #include "base/file_path.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/common/gfx/text_elider.h b/chrome/common/gfx/text_elider.h index 2f88845..61bfada 100644 --- a/chrome/common/gfx/text_elider.h +++ b/chrome/common/gfx/text_elider.h @@ -8,9 +8,9 @@ #include <unicode/coll.h> #include <unicode/uchar.h> +#include "app/gfx/chrome_font.h" #include "base/basictypes.h" #include "base/string16.h" -#include "chrome/common/gfx/chrome_font.h" class FilePath; class GURL; diff --git a/chrome/common/gfx/text_elider_unittest.cc b/chrome/common/gfx/text_elider_unittest.cc index c47e0bd..3a2eb6d 100644 --- a/chrome/common/gfx/text_elider_unittest.cc +++ b/chrome/common/gfx/text_elider_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/gfx/chrome_font.h" #include "base/file_path.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/text_elider.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/win_util.h b/chrome/common/win_util.h index e838e4d..282fe2a3 100644 --- a/chrome/common/win_util.h +++ b/chrome/common/win_util.h @@ -10,10 +10,10 @@ #include <string> #include <vector> +#include "app/gfx/chrome_font.h" #include "base/fix_wp64.h" #include "base/gfx/rect.h" #include "base/scoped_handle.h" -#include "chrome/common/gfx/chrome_font.h" class FilePath; diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 9f84d5e..f274c23 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -1096,6 +1096,10 @@ > </File> <File + RelativePath="..\..\..\app\gfx\chrome_font_unittest.cc" + > + </File> + <File RelativePath="..\..\..\app\l10n_util_unittest.cc" > </File> diff --git a/chrome/views/controls/button/menu_button.h b/chrome/views/controls/button/menu_button.h index 119abb2..83485d0 100644 --- a/chrome/views/controls/button/menu_button.h +++ b/chrome/views/controls/button/menu_button.h @@ -7,7 +7,7 @@ #include <windows.h> -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/text_button.h" #include "base/time.h" diff --git a/chrome/views/controls/button/native_button.h b/chrome/views/controls/button/native_button.h index e7293c2..bfe6639 100644 --- a/chrome/views/controls/button/native_button.h +++ b/chrome/views/controls/button/native_button.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_ #define CHROME_VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_ -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/button/native_button_wrapper.h" diff --git a/chrome/views/controls/button/text_button.h b/chrome/views/controls/button/text_button.h index 6f59088..bdca6cb 100644 --- a/chrome/views/controls/button/text_button.h +++ b/chrome/views/controls/button/text_button.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ #define CHROME_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "chrome/views/border.h" #include "chrome/views/controls/button/custom_button.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/views/controls/combo_box.cc b/chrome/views/controls/combo_box.cc index db6c86b..ca73727 100644 --- a/chrome/views/controls/combo_box.cc +++ b/chrome/views/controls/combo_box.cc @@ -5,11 +5,11 @@ #include "chrome/views/controls/combo_box.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.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_font.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 e0acde8..7cd8920 100644 --- a/chrome/views/controls/label.cc +++ b/chrome/views/controls/label.cc @@ -7,11 +7,11 @@ #include <math.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/views/background.h" diff --git a/chrome/views/controls/label.h b/chrome/views/controls/label.h index b2f1679..cf4dede 100644 --- a/chrome/views/controls/label.h +++ b/chrome/views/controls/label.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_CONTROLS_LABEL_H_ #define CHROME_VIEWS_CONTROLS_LABEL_H_ -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "chrome/views/view.h" #include "googleurl/src/gurl.h" #include "skia/include/SkColor.h" diff --git a/chrome/views/controls/link.cc b/chrome/views/controls/link.cc index 7969987..53d2495 100644 --- a/chrome/views/controls/link.cc +++ b/chrome/views/controls/link.cc @@ -4,7 +4,7 @@ #include "chrome/views/controls/link.h" -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "chrome/views/event.h" namespace views { diff --git a/chrome/views/controls/menu/chrome_menu.h b/chrome/views/controls/menu/chrome_menu.h index f8b5e17..5258742 100644 --- a/chrome/views/controls/menu/chrome_menu.h +++ b/chrome/views/controls/menu/chrome_menu.h @@ -8,12 +8,12 @@ #include <list> #include <vector> +#include "app/gfx/chrome_font.h" #include "base/gfx/point.h" #include "base/gfx/rect.h" #include "base/message_loop.h" #include "base/task.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/views/controls/menu/controller.h" #include "chrome/views/view.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/views/controls/menu/menu.cc b/chrome/views/controls/menu/menu.cc index 3e4e6ae..09ebe8d 100644 --- a/chrome/views/controls/menu/menu.cc +++ b/chrome/views/controls/menu/menu.cc @@ -13,13 +13,13 @@ #include <string> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #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_font.h" #include "chrome/views/accelerator.h" const SkBitmap* Menu::Delegate::kEmptyIcon = 0; diff --git a/chrome/views/controls/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc index e0205a9..487c0b5 100644 --- a/chrome/views/controls/tabbed_pane.cc +++ b/chrome/views/controls/tabbed_pane.cc @@ -7,12 +7,12 @@ #include <vssym32.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.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_font.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/text_field.h b/chrome/views/controls/text_field.h index ffa5469..6de2218 100644 --- a/chrome/views/controls/text_field.h +++ b/chrome/views/controls/text_field.h @@ -10,8 +10,8 @@ #include <string> +#include "app/gfx/chrome_font.h" #include "base/basictypes.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/views/view.h" #include "skia/include/SkColor.h" diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc index e3cdad6..d5d587e 100644 --- a/chrome/views/window/custom_frame_view.cc +++ b/chrome/views/window/custom_frame_view.cc @@ -5,10 +5,10 @@ #include "chrome/views/window/custom_frame_view.h" #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/win_util.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window_delegate.h" diff --git a/chrome/views/window/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc index 099ff60..8f82443 100644 --- a/chrome/views/window/dialog_client_view.cc +++ b/chrome/views/window/dialog_client_view.cc @@ -9,11 +9,11 @@ #include <vsstyle.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.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_font.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/dialog_client_view.h b/chrome/views/window/dialog_client_view.h index 0e311bb..0a88e19 100644 --- a/chrome/views/window/dialog_client_view.h +++ b/chrome/views/window/dialog_client_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ #define CHROME_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ -#include "chrome/common/gfx/chrome_font.h" +#include "app/gfx/chrome_font.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/window/client_view.h" diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc index 9a603f9..58301f5 100644 --- a/chrome/views/window/window_win.cc +++ b/chrome/views/window/window_win.cc @@ -7,11 +7,11 @@ #include <shellapi.h> #include "app/gfx/chrome_canvas.h" +#include "app/gfx/chrome_font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" |