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/browser/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/browser/views')
-rw-r--r-- | chrome/browser/views/blocked_popup_container.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/bookmark_bar_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/download_item_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/download_shelf_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/download_started_animation.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/find_bar_win.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/fullscreen_exit_bubble.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/info_bubble.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/infobars/infobars.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/infobars/infobars.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/status_bubble_views.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/dragged_tab_controller.cc | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.h | 2 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_renderer.h | 6 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 2 |
15 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h index 4a6fabe..214b8f8 100644 --- a/chrome/browser/views/blocked_popup_container.h +++ b/chrome/browser/views/blocked_popup_container.h @@ -13,10 +13,10 @@ #include <utility> #include <vector> +#include "app/animation.h" #include "base/gfx/rect.h" #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/common/animation.h" #include "chrome/common/pref_member.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/menu/menu.h" diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h index f96c35a..53d5e68 100644 --- a/chrome/browser/views/bookmark_bar_view.h +++ b/chrome/browser/views/bookmark_bar_view.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ +#include "app/slide_animation.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_menu_controller.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/common/slide_animation.h" #include "chrome/views/controls/button/menu_button.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/menu/menu.h" diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h index 730b425..06c344a 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/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/common/slide_animation.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/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h index d73aa9f..5de3d34 100644 --- a/chrome/browser/views/download_shelf_view.h +++ b/chrome/browser/views/download_shelf_view.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_ #define CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_ +#include "app/slide_animation.h" #include "chrome/browser/download/download_shelf.h" -#include "chrome/common/slide_animation.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/link.h" diff --git a/chrome/browser/views/download_started_animation.h b/chrome/browser/views/download_started_animation.h index bd8dec5..162560d 100644 --- a/chrome/browser/views/download_started_animation.h +++ b/chrome/browser/views/download_started_animation.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_STARTED_ANIMATION_H_ #define CHROME_BROWSER_VIEWS_DOWNLOAD_STARTED_ANIMATION_H_ +#include "app/animation.h" #include "base/gfx/rect.h" -#include "chrome/common/animation.h" #include "chrome/common/notification_registrar.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/find_bar_win.h b/chrome/browser/views/find_bar_win.h index 4f6cf31..ccdb497 100644 --- a/chrome/browser/views/find_bar_win.h +++ b/chrome/browser/views/find_bar_win.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_VIEWS_FIND_BAR_WIN_H_ #define CHROME_BROWSER_VIEWS_FIND_BAR_WIN_H_ +#include "app/animation.h" #include "base/gfx/rect.h" #include "chrome/browser/find_bar.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" -#include "chrome/common/animation.h" #include "chrome/views/widget/widget_win.h" class BrowserView; diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h index 7e354bd..59825d3 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.h +++ b/chrome/browser/views/fullscreen_exit_bubble.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H__ #define CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H__ +#include "app/slide_animation.h" #include "base/scoped_ptr.h" #include "chrome/browser/command_updater.h" -#include "chrome/common/slide_animation.h" #include "chrome/views/controls/link.h" #include "chrome/views/widget/widget_win.h" diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h index a837af8..235a2b6 100644 --- a/chrome/browser/views/info_bubble.h +++ b/chrome/browser/views/info_bubble.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_ #define CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_ -#include "chrome/common/slide_animation.h" +#include "app/slide_animation.h" #include "chrome/views/view.h" #include "chrome/views/widget/widget_win.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index fd61ba6..c4a0618 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -5,12 +5,12 @@ #include "chrome/browser/views/infobars/infobars.h" #include "app/resource_bundle.h" +#include "app/slide_animation.h" #include "base/message_loop.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/slide_animation.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h index 7b5feae..2daefa9 100644 --- a/chrome/browser/views/infobars/infobars.h +++ b/chrome/browser/views/infobars/infobars.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_ #define CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_ +#include "app/animation.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/common/animation.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/link.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index 2426bf1..002cf7f 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -6,9 +6,9 @@ #include <algorithm> +#include "app/animation.h" #include "app/resource_bundle.h" #include "base/string_util.h" -#include "chrome/common/animation.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index 8df9a38..370a170 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -7,6 +7,7 @@ #include <math.h> #include <set> +#include "app/animation.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" @@ -18,7 +19,6 @@ #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/animation.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/views/event.h" diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h index fb26254..5802ec2 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.h +++ b/chrome/browser/views/tabs/dragged_tab_view.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_ #define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_ +#include "app/slide_animation.h" #include "base/gfx/point.h" #include "base/gfx/size.h" #include "base/task.h" -#include "chrome/common/slide_animation.h" #include "chrome/views/view.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h index 2f456e4..67c4639 100644 --- a/chrome/browser/views/tabs/tab_renderer.h +++ b/chrome/browser/views/tabs/tab_renderer.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__ #define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__ +#include "app/animation.h" +#include "app/slide_animation.h" +#include "app/throb_animation.h" #include "base/gfx/point.h" -#include "chrome/common/animation.h" -#include "chrome/common/slide_animation.h" -#include "chrome/common/throb_animation.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/menu/menu.h" #include "chrome/views/view.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 0543628..9d301f0 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -5,6 +5,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "app/resource_bundle.h" +#include "app/slide_animation.h" #include "base/gfx/size.h" #include "base/stl_util-inl.h" #include "chrome/browser/metrics/user_metrics.h" @@ -21,7 +22,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" -#include "chrome/common/slide_animation.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/image_view.h" #include "chrome/views/painter.h" |