summaryrefslogtreecommitdiffstats
path: root/ash/wm/property_util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/property_util.cc')
-rw-r--r--ash/wm/property_util.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/wm/property_util.cc b/ash/wm/property_util.cc
index 413eeb9..4c0470a 100644
--- a/ash/wm/property_util.cc
+++ b/ash/wm/property_util.cc
@@ -5,6 +5,7 @@
#include "ash/wm/property_util.h"
#include "ash/ash_export.h"
+#include "ash/root_window_settings.h"
#include "ash/screen_ash.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
@@ -67,12 +68,12 @@ bool GetWindowAlwaysRestoresToRestoreBounds(const aura::Window* window) {
internal::RootWindowController* GetRootWindowController(
const aura::RootWindow* root_window) {
return root_window ?
- root_window->GetProperty(internal::kRootWindowControllerKey) : NULL;
+ internal::GetRootWindowSettings(root_window)->controller : NULL;
}
void SetRootWindowController(aura::RootWindow* root_window,
internal::RootWindowController* controller) {
- root_window->SetProperty(internal::kRootWindowControllerKey, controller);
+ internal::GetRootWindowSettings(root_window)->controller = controller;
}
} // namespace ash