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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_properties.h

Issue 11419013: Add desktop vs. ash context to ui_controls Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 8 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
« ash/shell.cc ('K') | « ash/ui_controls_ash.cc ('k') | ash/wm/window_properties.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_properties.h
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 013e08e045b6f6091fa7dc47611760a9ce1e3179..272d8a7076e39f2b3ab34763ea6f8f99c2fe5ad9 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -15,7 +15,7 @@ class Rect;
}
namespace ui_controls {
-class UIControlsAura;
+class UIControls;
}
namespace ash {
@@ -62,7 +62,7 @@ ASH_EXPORT extern const aura::WindowProperty<bool>* const
kStayInSameRootWindowKey;
// Used to store a ui_controls for each root window.
-extern const aura::WindowProperty<ui_controls::UIControlsAura*>* const
+extern const aura::WindowProperty<ui_controls::UIControls*>* const
kUIControlsKey;
// A property key to remember if a windows position or size was changed by a
« ash/shell.cc ('K') | « ash/ui_controls_ash.cc ('k') | ash/wm/window_properties.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698