diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 21:49:11 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 21:49:11 +0000 |
| commit | f8e6aad21d6b80d3c317b83bfb66e4f9ac8e7310 (patch) | |
| tree | dfc059c7f1e81e3efb45f52a59234899bc004d35 /ash/touch | |
| parent | c70e539e9e772ad74f42c5e83534430d8fd17fe9 (diff) | |
| download | chromium_src-f8e6aad21d6b80d3c317b83bfb66e4f9ac8e7310.zip chromium_src-f8e6aad21d6b80d3c317b83bfb66e4f9ac8e7310.tar.gz chromium_src-f8e6aad21d6b80d3c317b83bfb66e4f9ac8e7310.tar.bz2 | |
Introduce RootWindowProperty for RootWindow's properties
BUG=272460
Review URL: https://chromiumcodereview.appspot.com/23496024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/touch')
| -rw-r--r-- | ash/touch/touch_observer_hud.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index 9dcccd3..ed208c8 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 = |