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

Unified Diff: trunk/src/ash/display/output_configurator_animation.h

Issue 59153004: Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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: trunk/src/ash/display/output_configurator_animation.h
===================================================================
--- trunk/src/ash/display/output_configurator_animation.h (revision 233812)
+++ trunk/src/ash/display/output_configurator_animation.h (working copy)
@@ -14,7 +14,6 @@
namespace aura {
class RootWindow;
-class Window;
} // namespace aura
namespace ui {
@@ -55,7 +54,7 @@
// and *not* call the registered callback.
void ClearHidingLayers();
- std::map<aura::Window*, ui::Layer*> hiding_layers_;
+ std::map<aura::RootWindow*, ui::Layer*> hiding_layers_;
scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_;
DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation);
« no previous file with comments | « trunk/src/ash/display/mouse_cursor_event_filter_unittest.cc ('k') | trunk/src/ash/display/output_configurator_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698