Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: ash/wm/immersive_fullscreen_controller.h

Issue 132013004: Moves transient window observer methods out of WindowObserver (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to trunk Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/immersive_fullscreen_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/immersive_fullscreen_controller.h
diff --git a/ash/wm/immersive_fullscreen_controller.h b/ash/wm/immersive_fullscreen_controller.h
index 9b6b600b1682e059927d52b08cc19ad98e572a2a..bee6642f97c18e9a74ccdf3d6c00804becabe789 100644
--- a/ash/wm/immersive_fullscreen_controller.h
+++ b/ash/wm/immersive_fullscreen_controller.h
@@ -13,6 +13,7 @@
#include "ui/aura/window_observer.h"
#include "ui/events/event_handler.h"
#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/views/corewm/transient_window_observer.h"
#include "ui/views/focus/focus_manager.h"
#include "ui/views/widget/widget_observer.h"
@@ -40,9 +41,9 @@ namespace ash {
class ASH_EXPORT ImmersiveFullscreenController
: public gfx::AnimationDelegate,
public ui::EventHandler,
+ public views::corewm::TransientWindowObserver,
public views::FocusChangeListener,
public views::WidgetObserver,
- public aura::WindowObserver,
public ImmersiveRevealedLock::Delegate {
public:
// The enum is used for an enumerated histogram. New items should be only
@@ -142,11 +143,11 @@ class ASH_EXPORT ImmersiveFullscreenController
virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
- // aura::WindowObserver overrides:
- virtual void OnAddTransientChild(aura::Window* window,
- aura::Window* transient) OVERRIDE;
- virtual void OnRemoveTransientChild(aura::Window* window,
- aura::Window* transient) OVERRIDE;
+ // views::corewm::TransientWindowObserver overrides:
+ virtual void OnTransientChildAdded(aura::Window* window,
+ aura::Window* transient) OVERRIDE;
+ virtual void OnTransientChildRemoved(aura::Window* window,
+ aura::Window* transient) OVERRIDE;
// ash::ImmersiveRevealedLock::Delegate overrides:
virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE;
« no previous file with comments | « no previous file | ash/wm/immersive_fullscreen_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698