diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 04:52:11 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 04:52:11 +0000 |
commit | 220705c2b06962462e471b28ad85c76c0f9c3080 (patch) | |
tree | cfc44266116bbf2acc3a4fae32625c4481c8243e /chrome/views | |
parent | 1b8d02f181d089ee670f2ba72089c3722f679d5f (diff) | |
download | chromium_src-220705c2b06962462e471b28ad85c76c0f9c3080.zip chromium_src-220705c2b06962462e471b28ad85c76c0f9c3080.tar.gz chromium_src-220705c2b06962462e471b28ad85c76c0f9c3080.tar.bz2 |
Move *Animation to app/
http://crbug.com/11387
Review URL: http://codereview.chromium.org/109001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
-rw-r--r-- | chrome/views/controls/button/custom_button.cc | 11 | ||||
-rw-r--r-- | chrome/views/controls/button/custom_button.h | 2 | ||||
-rw-r--r-- | chrome/views/controls/button/image_button.cc | 5 | ||||
-rw-r--r-- | chrome/views/controls/button/text_button.cc | 7 | ||||
-rw-r--r-- | chrome/views/controls/tabbed_pane.cc | 1 |
5 files changed, 4 insertions, 22 deletions
diff --git a/chrome/views/controls/button/custom_button.cc b/chrome/views/controls/button/custom_button.cc index 4193918..3e9d33d 100644 --- a/chrome/views/controls/button/custom_button.cc +++ b/chrome/views/controls/button/custom_button.cc @@ -4,17 +4,8 @@ #include "chrome/views/controls/button/custom_button.h" +#include "app/throb_animation.h" #include "base/keyboard_codes.h" -#include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/throb_animation.h" - -// TODO(erg): Write drag'n'drop for Linux. -#if defined(OS_WIN) -#include "base/base_drag_source.h" -#include "chrome/browser/drag_utils.h" -#include "chrome/common/os_exchange_data.h" -#endif namespace views { diff --git a/chrome/views/controls/button/custom_button.h b/chrome/views/controls/button/custom_button.h index db0bc9e..6b486a7 100644 --- a/chrome/views/controls/button/custom_button.h +++ b/chrome/views/controls/button/custom_button.h @@ -5,7 +5,7 @@ #ifndef CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ #define CHROME_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ -#include "chrome/common/animation.h" +#include "app/animation.h" #include "chrome/views/controls/button/button.h" class ThrobAnimation; diff --git a/chrome/views/controls/button/image_button.cc b/chrome/views/controls/button/image_button.cc index 235cc83..8b5ec86 100644 --- a/chrome/views/controls/button/image_button.cc +++ b/chrome/views/controls/button/image_button.cc @@ -4,11 +4,8 @@ #include "chrome/views/controls/button/image_button.h" -#include "chrome/app/chrome_dll_resource.h" +#include "app/throb_animation.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/throb_animation.h" -#include "grit/generated_resources.h" #include "skia/ext/image_operations.h" namespace views { diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc index 5457281..b821db9 100644 --- a/chrome/views/controls/button/text_button.cc +++ b/chrome/views/controls/button/text_button.cc @@ -4,19 +4,14 @@ #include "chrome/views/controls/button/text_button.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/common/throb_animation.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/event.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" -#if defined(OS_WIN) -#include "chrome/common/win_util.h" -#endif - namespace views { // Padding between the icon and text. diff --git a/chrome/views/controls/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc index 6fac67c..64d267b1 100644 --- a/chrome/views/controls/tabbed_pane.cc +++ b/chrome/views/controls/tabbed_pane.cc @@ -13,7 +13,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/l10n_util_win.h" -#include "chrome/common/throb_animation.h" #include "chrome/views/background.h" #include "chrome/views/fill_layout.h" #include "chrome/views/widget/root_view.h" |