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

Unified Diff: ash/wm/immersive_fullscreen_controller.cc

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
Index: ash/wm/immersive_fullscreen_controller.cc
diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc
index 14eee9d85c32ed962cfdfcc609ae57966bfc6a80..b31c8b8a17532764c0600cb529063cd4cfe7516d 100644
--- a/ash/wm/immersive_fullscreen_controller.cc
+++ b/ash/wm/immersive_fullscreen_controller.cc
@@ -23,6 +23,7 @@
#include "ui/gfx/rect.h"
#include "ui/gfx/screen.h"
#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/corewm/transient_window_manager.h"
#include "ui/views/corewm/window_util.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -473,7 +474,7 @@ void ImmersiveFullscreenController::AnimationProgressed(
////////////////////////////////////////////////////////////////////////////////
// aura::WindowObserver overrides:
-void ImmersiveFullscreenController::OnAddTransientChild(
+void ImmersiveFullscreenController::OnTransientChildAdded(
aura::Window* window,
aura::Window* transient) {
views::BubbleDelegateView* bubble_delegate = AsBubbleDelegate(transient);
@@ -487,7 +488,7 @@ void ImmersiveFullscreenController::OnAddTransientChild(
}
}
-void ImmersiveFullscreenController::OnRemoveTransientChild(
+void ImmersiveFullscreenController::OnTransientChildRemoved(
aura::Window* window,
aura::Window* transient) {
bubble_manager_->StopObserving(transient);
@@ -527,14 +528,16 @@ void ImmersiveFullscreenController::EnableWindowObservers(bool enable) {
widget_->AddObserver(this);
focus_manager->AddFocusChangeListener(this);
Shell::GetInstance()->AddPreTargetHandler(this);
- native_window_->AddObserver(this);
+ views::corewm::TransientWindowManager::Get(native_window_)->
+ AddObserver(this);
RecreateBubbleManager();
} else {
widget_->RemoveObserver(this);
focus_manager->RemoveFocusChangeListener(this);
Shell::GetInstance()->RemovePreTargetHandler(this);
- native_window_->RemoveObserver(this);
+ views::corewm::TransientWindowManager::Get(native_window_)->
+ RemoveObserver(this);
// We have stopped observing whether transient children are added or removed
// to |native_window_|. The set of bubbles that BubbleManager is observing
« no previous file with comments | « ash/wm/immersive_fullscreen_controller.h ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698