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

Unified Diff: ash/wm/property_util.cc

Issue 24020002: Move GetRootWindowController() to root_window_controller.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | « ash/wm/property_util.h ('k') | ash/wm/root_window_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/property_util.cc
diff --git a/ash/wm/property_util.cc b/ash/wm/property_util.cc
index 4c0470a8d28998fdeb505e96f9a4487734acd6fb..5aac996a5d4c7d32da16f620d7d3e678fdf890e2 100644
--- a/ash/wm/property_util.cc
+++ b/ash/wm/property_util.cc
@@ -4,13 +4,9 @@
#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"
#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/rect.h"
@@ -65,15 +61,4 @@ bool GetWindowAlwaysRestoresToRestoreBounds(const aura::Window* window) {
return window->GetProperty(internal::kWindowRestoresToRestoreBounds);
}
-internal::RootWindowController* GetRootWindowController(
- const aura::RootWindow* root_window) {
- return root_window ?
- internal::GetRootWindowSettings(root_window)->controller : NULL;
-}
-
-void SetRootWindowController(aura::RootWindow* root_window,
- internal::RootWindowController* controller) {
- internal::GetRootWindowSettings(root_window)->controller = controller;
-}
-
} // namespace ash
« no previous file with comments | « ash/wm/property_util.h ('k') | ash/wm/root_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698