ash/touch/touch_observer_hud.cc - Issue 23496024: Introduce RootWindowProperty for RootWindow's properties

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rename 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:

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..ed208c89d48eb1ee40e456d6feed9dfafbc3bdb4 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_settings.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_(GetRootWindowSettings(initial_root)->display_id),

root_window_(initial_root),

widget_(NULL) {

const gfx::Display& display =

« no previous file with comments | « ash/root_window_settings.cc ('k') | ash/wm/frame_painter.cc » ('j') | no next file with comments »