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

Unified Diff: ash/wm/stacking_controller.h

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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/session_state_animator.cc ('k') | ash/wm/stacking_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/stacking_controller.h
diff --git a/ash/wm/stacking_controller.h b/ash/wm/stacking_controller.h
index 0aa690eee4046d5bf5112e343b888669cf61a366..bbe715eba30c3498dbd1dd7d7d77e6fbcf4bcccf 100644
--- a/ash/wm/stacking_controller.h
+++ b/ash/wm/stacking_controller.h
@@ -11,12 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "ui/aura/client/window_tree_client.h"
-namespace aura{
-class RootWindow;
-}
-
namespace ash {
-
namespace internal {
class AlwaysOnTopController;
}
@@ -37,7 +32,7 @@ class ASH_EXPORT StackingController : public aura::client::WindowTreeClient {
// normal modal container.
// Otherwise those that originate from LockScreen container and above are
// placed in the screen lock modal container.
- aura::Window* GetSystemModalContainer(aura::RootWindow* root,
+ aura::Window* GetSystemModalContainer(aura::Window* root,
aura::Window* window) const;
DISALLOW_COPY_AND_ASSIGN(StackingController);
« no previous file with comments | « ash/wm/session_state_animator.cc ('k') | ash/wm/stacking_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698