diff options
Diffstat (limited to 'ash/wm/frame_painter.h')
| -rw-r--r-- | ash/wm/frame_painter.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ash/wm/frame_painter.h b/ash/wm/frame_painter.h index a5d40fb..4a9e968 100644 --- a/ash/wm/frame_painter.h +++ b/ash/wm/frame_painter.h @@ -6,7 +6,6 @@ #define ASH_WM_FRAME_PAINTER_H_ #include "ash/ash_export.h" -#include "ash/wm/window_settings.h" #include "base/basictypes.h" #include "base/compiler_specific.h" // OVERRIDE #include "base/gtest_prod_util.h" @@ -42,8 +41,7 @@ class FrameCaptionButtonContainerView; // various implementations of views::NonClientFrameView. Canonical source of // layout constants for Ash window frames. class ASH_EXPORT FramePainter : public aura::WindowObserver, - public ui::AnimationDelegate, - public wm::WindowSettings::Observer { + public ui::AnimationDelegate { public: // Opacity values for the window header in various states, from 0 to 255. static int kActiveWindowOpacity; @@ -147,10 +145,6 @@ class ASH_EXPORT FramePainter : public aura::WindowObserver, virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE; virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE; - // ash::WindowSettings::Observer overrides: - virtual void OnTrackedByWorkspaceChanged(aura::Window* window, - bool old) OVERRIDE; - // Overridden from ui::AnimationDelegate virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; |