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

Unified Diff: ui/oak/oak_aura_window_display.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix MRUWindowTracker and MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest Created 7 years 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: ui/oak/oak_aura_window_display.cc
diff --git a/ui/oak/oak_aura_window_display.cc b/ui/oak/oak_aura_window_display.cc
index e751a332393ff0bcceafecbbad668c0085d09f36..904cca49876275c33171df89e2d2e39c1e7505ae 100644
--- a/ui/oak/oak_aura_window_display.cc
+++ b/ui/oak/oak_aura_window_display.cc
@@ -11,6 +11,7 @@
#include "ui/aura/window.h"
#include "ui/base/models/table_model_observer.h"
#include "ui/oak/oak_pretty_print.h"
+#include "ui/views/corewm/transient_window_manager.h"
namespace oak {
namespace internal {
@@ -131,11 +132,12 @@ base::string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
case ROW_ROOTWINDOW:
return PropertyWithVoidStar("Root Window: ", window_->GetRootWindow());
case ROW_TRANSIENTCHILDREN:
- return PropertyWithInteger("Transient Children: ",
- window_->transient_children().size());
+ return PropertyWithInteger(
+ "Transient Children: ",
+ views::corewm::GetTransientChildren(window_).size());
case ROW_TRANSIENTPARENT:
return PropertyWithVoidStar("Transient Parent: ",
- window_->transient_parent());
+ views::corewm::GetTransientParent(window_));
case ROW_USERDATA:
return PropertyWithVoidStar("User Data: ", window_->user_data());
case ROW_IGNOREEVENTS:

Powered by Google App Engine
This is Rietveld 408576698