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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/touch/touch_observer_hud.cc

Issue 23496024: Introduce RootWindowProperty for RootWindow's properties (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
« ash/root_window_property.cc ('K') | « ash/root_window_property.cc ('k') | ash/wm/frame_painter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud.cc
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index 9dcccd3f9fcab2a20579eb2de919ecb2a22cb9c6..dbe18438a2460464b670fd81f85dae708495bf74 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -5,10 +5,10 @@
#include "ash/touch/touch_observer_hud.h"
#include "ash/root_window_controller.h"
+#include "ash/root_window_property.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/property_util.h"
-#include "ash/wm/window_properties.h"
#include "ui/aura/root_window.h"
#include "ui/gfx/display.h"
#include "ui/gfx/rect.h"
@@ -20,7 +20,7 @@ namespace ash {
namespace internal {
TouchObserverHUD::TouchObserverHUD(aura::RootWindow* initial_root)
- : display_id_(initial_root->GetProperty(kDisplayIdKey)),
+ : display_id_(GetRootWindowProperty(initial_root)->display_id),
root_window_(initial_root),
widget_(NULL) {
const gfx::Display& display =
« ash/root_window_property.cc ('K') | « ash/root_window_property.cc ('k') | ash/wm/frame_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698