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

Unified Diff: ui/views/corewm/wm_state.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unneeded parens 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 | « ui/views/corewm/wm_state.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/wm_state.cc
diff --git a/ui/views/corewm/wm_state.cc b/ui/views/corewm/wm_state.cc
index 07992479d64cfa8521b269a29dc04332d6aaa250..16d9e7ac9998fb8e2c6d1c301dbfe3cca4cc7528 100644
--- a/ui/views/corewm/wm_state.cc
+++ b/ui/views/corewm/wm_state.cc
@@ -4,19 +4,27 @@
#include "ui/views/corewm/wm_state.h"
+#include "ui/views/corewm/transient_window_controller.h"
#include "ui/views/corewm/transient_window_stacking_client.h"
namespace views {
namespace corewm {
WMState::WMState()
- : window_stacking_client_(new TransientWindowStackingClient) {
+ : window_stacking_client_(new TransientWindowStackingClient),
+ transient_window_client_(new TransientWindowController) {
aura::client::SetWindowStackingClient(window_stacking_client_.get());
+ aura::client::SetTransientWindowClient(transient_window_client_.get());
}
WMState::~WMState() {
if (aura::client::GetWindowStackingClient() == window_stacking_client_.get())
aura::client::SetWindowStackingClient(NULL);
+
+ if (aura::client::GetTransientWindowClient() ==
+ transient_window_client_.get()) {
+ aura::client::SetTransientWindowClient(NULL);
+ }
}
} // namespace corewm
« no previous file with comments | « ui/views/corewm/wm_state.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698