diff options
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.h | 3 | ||||
-rw-r--r-- | chrome/browser/gtk/browser_actions_toolbar_gtk.h | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/browser_toolbar_gtk.h | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/custom_button.h | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/download_item_gtk.h | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/hover_controller_gtk.h | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/infobar_arrow_model.h | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/infobar_gtk.h | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/notifications/balloon_view_gtk.h | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/slide_animator_gtk.h | 2 | ||||
-rw-r--r-- | chrome/browser/gtk/status_bubble_gtk.cc | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/status_bubble_gtk.h | 3 | ||||
-rw-r--r-- | chrome/browser/gtk/tabs/dragged_tab_gtk.h | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/tabs/tab_renderer_gtk.cc | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/tabs/tab_renderer_gtk.h | 4 | ||||
-rw-r--r-- | chrome/browser/gtk/tabs/tab_strip_gtk.cc | 1 | ||||
-rw-r--r-- | chrome/browser/gtk/translate/translate_infobar_base_gtk.h | 1 |
18 files changed, 20 insertions, 8 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index d40405fbd..4784b2a 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -7,6 +7,7 @@ #include <vector> #include "app/gtk_dnd_util.h" +#include "app/slide_animation.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h index 2e7f985..0939c70 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.h +++ b/chrome/browser/gtk/bookmark_bar_gtk.h @@ -10,8 +10,8 @@ #include <vector> +#include "app/animation_delegate.h" #include "app/gtk_signal.h" -#include "app/slide_animation.h" #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h" @@ -34,6 +34,7 @@ class GtkThemeProvider; class MenuGtk; class PageNavigator; class Profile; +class SlideAnimation; class TabstripOriginProvider; class BookmarkBarGtk : public AnimationDelegate, diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.h b/chrome/browser/gtk/browser_actions_toolbar_gtk.h index 72cf960..ac80386 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.h +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.h @@ -9,6 +9,7 @@ #include <map> #include <string> +#include "app/animation_delegate.h" #include "app/gtk_signal.h" #include "app/gtk_signal_registrar.h" #include "app/menus/simple_menu_model.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h index 1e27f8f..f2e8fec 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/gtk/browser_toolbar_gtk.h @@ -10,6 +10,7 @@ #include <string> #include "app/active_window_watcher_x.h" +#include "app/animation_delegate.h" #include "app/gtk_signal.h" #include "app/gtk_signal_registrar.h" #include "app/menus/accelerator.h" diff --git a/chrome/browser/gtk/custom_button.h b/chrome/browser/gtk/custom_button.h index 4d19510..785df6b 100644 --- a/chrome/browser/gtk/custom_button.h +++ b/chrome/browser/gtk/custom_button.h @@ -8,6 +8,7 @@ #include <gtk/gtk.h> +#include "app/animation_delegate.h" #include "app/gtk_signal.h" #include "app/slide_animation.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/gtk/download_item_gtk.h b/chrome/browser/gtk/download_item_gtk.h index f73592a..a9ad27d 100644 --- a/chrome/browser/gtk/download_item_gtk.h +++ b/chrome/browser/gtk/download_item_gtk.h @@ -10,7 +10,7 @@ #include <string> -#include "app/animation.h" +#include "app/animation_delegate.h" #include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "base/time.h" diff --git a/chrome/browser/gtk/hover_controller_gtk.h b/chrome/browser/gtk/hover_controller_gtk.h index 4806e34..5504720 100644 --- a/chrome/browser/gtk/hover_controller_gtk.h +++ b/chrome/browser/gtk/hover_controller_gtk.h @@ -8,6 +8,7 @@ #include <gtk/gtk.h> +#include "app/animation_delegate.h" #include "app/gtk_signal.h" #include "app/gtk_signal_registrar.h" #include "app/slide_animation.h" diff --git a/chrome/browser/gtk/infobar_arrow_model.h b/chrome/browser/gtk/infobar_arrow_model.h index 369e586..721f32b 100644 --- a/chrome/browser/gtk/infobar_arrow_model.h +++ b/chrome/browser/gtk/infobar_arrow_model.h @@ -7,6 +7,7 @@ #include <gtk/gtk.h> +#include "app/animation_delegate.h" #include "app/slide_animation.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/chrome/browser/gtk/infobar_gtk.h b/chrome/browser/gtk/infobar_gtk.h index 4293ea8..d0dd542 100644 --- a/chrome/browser/gtk/infobar_gtk.h +++ b/chrome/browser/gtk/infobar_gtk.h @@ -7,7 +7,6 @@ #pragma once #include "app/gtk_signal.h" -#include "app/slide_animation.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "chrome/browser/gtk/infobar_arrow_model.h" diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.h b/chrome/browser/gtk/notifications/balloon_view_gtk.h index 652a610..dce5869 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.h +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.h @@ -8,7 +8,7 @@ #define CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_GTK_H_ #pragma once -#include "app/animation.h" +#include "app/animation_delegate.h" #include "app/gtk_signal.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/gtk/slide_animator_gtk.h b/chrome/browser/gtk/slide_animator_gtk.h index df6d29b..dabdd70 100644 --- a/chrome/browser/gtk/slide_animator_gtk.h +++ b/chrome/browser/gtk/slide_animator_gtk.h @@ -17,7 +17,7 @@ #include <gtk/gtk.h> -#include "app/animation.h" +#include "app/animation_delegate.h" #include "base/scoped_ptr.h" #include "chrome/browser/gtk/owned_widget_gtk.h" diff --git a/chrome/browser/gtk/status_bubble_gtk.cc b/chrome/browser/gtk/status_bubble_gtk.cc index fbb8989..08eab1a 100644 --- a/chrome/browser/gtk/status_bubble_gtk.cc +++ b/chrome/browser/gtk/status_bubble_gtk.cc @@ -8,6 +8,7 @@ #include <algorithm> +#include "app/slide_animation.h" #include "app/text_elider.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" diff --git a/chrome/browser/gtk/status_bubble_gtk.h b/chrome/browser/gtk/status_bubble_gtk.h index 1706665..b951b79 100644 --- a/chrome/browser/gtk/status_bubble_gtk.h +++ b/chrome/browser/gtk/status_bubble_gtk.h @@ -10,8 +10,8 @@ #include <string> +#include "app/animation_delegate.h" #include "app/gtk_signal.h" -#include "app/slide_animation.h" #include "base/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/gtk/owned_widget_gtk.h" @@ -23,6 +23,7 @@ class GtkThemeProvider; class Profile; +class SlideAnimation; // GTK implementation of StatusBubble. Unlike Windows, our status bubble // doesn't have the nice leave-the-window effect since we can't rely on the diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_gtk.h index 38c6525..6d7fcc4 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.h +++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.h @@ -8,6 +8,7 @@ #include <gtk/gtk.h> +#include "app/animation_delegate.h" #include "app/slide_animation.h" #include "base/callback.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index ad2c5fa..5afd379 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -9,6 +9,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "app/slide_animation.h" #include "app/throb_animation.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h index 51f11b7..6849a2a 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h @@ -9,9 +9,8 @@ #include <gtk/gtk.h> #include <map> -#include "app/animation.h" +#include "app/animation_delegate.h" #include "app/gtk_signal.h" -#include "app/slide_animation.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -29,6 +28,7 @@ class Size; class CustomDrawButton; class GtkThemeProvider; +class SlideAnimation; class TabContents; class ThemeProvider; class ThrobAnimation; diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 0685c43..41d1e27 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/animation_delegate.h" #include "app/gtk_dnd_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" diff --git a/chrome/browser/gtk/translate/translate_infobar_base_gtk.h b/chrome/browser/gtk/translate/translate_infobar_base_gtk.h index ce851f9..8b2303b 100644 --- a/chrome/browser/gtk/translate/translate_infobar_base_gtk.h +++ b/chrome/browser/gtk/translate/translate_infobar_base_gtk.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_GTK_TRANSLATE_TRANSLATE_INFOBAR_BASE_GTK_H_ #pragma once +#include "app/animation_delegate.h" #include "chrome/browser/translate/translate_infobar_view.h" #include "chrome/browser/gtk/infobar_gtk.h" |