diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 04:05:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 04:05:01 +0000 |
| commit | d07b6b5b992faad3506ac004503c11d25930cdca (patch) | |
| tree | a5a795b8980d90e4a10208ad4f8eabe140ee3e5e /views/window | |
| parent | f2a13d89ca22cdbe3808bcb14e02d5baee8d33b3 (diff) | |
| download | chromium_src-d07b6b5b992faad3506ac004503c11d25930cdca.zip chromium_src-d07b6b5b992faad3506ac004503c11d25930cdca.tar.gz chromium_src-d07b6b5b992faad3506ac004503c11d25930cdca.tar.bz2 | |
Move app/gfx/canvas and app/gfx/font to gfx/.
TBR=darin
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1132006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/custom_frame_view.cc | 4 | ||||
| -rw-r--r-- | views/window/dialog_client_view.cc | 4 | ||||
| -rw-r--r-- | views/window/dialog_client_view.h | 2 | ||||
| -rw-r--r-- | views/window/window.cc | 2 | ||||
| -rw-r--r-- | views/window/window_win.cc | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index d3d256f..cf0fc49 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -4,8 +4,6 @@ #include "views/window/custom_frame_view.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -13,6 +11,8 @@ #include "app/win_util.h" #include "base/win_util.h" #endif +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/path.h" #include "grit/app_resources.h" #include "grit/app_strings.h" diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 13ecc8c..8b32d63 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -14,11 +14,11 @@ #include <algorithm> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/keyboard_codes.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "grit/app_strings.h" #include "views/controls/button/native_button.h" #include "views/standard_layout.h" diff --git a/views/window/dialog_client_view.h b/views/window/dialog_client_view.h index 193ce1f..470481c 100644 --- a/views/window/dialog_client_view.h +++ b/views/window/dialog_client_view.h @@ -5,7 +5,7 @@ #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ #define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ -#include "app/gfx/font.h" +#include "gfx/font.h" #include "views/focus/focus_manager.h" #include "views/controls/button/button.h" #include "views/window/client_view.h" diff --git a/views/window/window.cc b/views/window/window.cc index 99bda55..522050f 100644 --- a/views/window/window.cc +++ b/views/window/window.cc @@ -4,10 +4,10 @@ #include "views/window/window.h" -#include "app/gfx/font.h" #include "app/gfx/font_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" +#include "gfx/font.h" #include "gfx/size.h" #include "views/widget/widget.h" diff --git a/views/window/window_win.cc b/views/window/window_win.cc index b58bcd4..4013523d9 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -7,14 +7,14 @@ #include <dwmapi.h> #include <shellapi.h> -#include "app/gfx/canvas_paint.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "app/win_util.h" #include "base/i18n/rtl.h" #include "base/win_util.h" +#include "gfx/canvas_paint.h" +#include "gfx/font.h" #include "gfx/icon_util.h" #include "gfx/path.h" #include "views/widget/root_view.h" |