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

Side by Side Diff: ash/touch/touch_observer_hud.cc

Issue 802473003: Fix references to ui/gfx headers in a*/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 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 unified diff | Download patch
« no previous file with comments | « ash/touch/touch_hud_projection.cc ('k') | ash/touch/touch_uma.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/touch/touch_observer_hud.h" 5 #include "ash/touch/touch_observer_hud.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/root_window_settings.h" 8 #include "ash/root_window_settings.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ui/aura/window_event_dispatcher.h" 11 #include "ui/aura/window_event_dispatcher.h"
12 #include "ui/gfx/display.h" 12 #include "ui/gfx/display.h"
13 #include "ui/gfx/rect.h" 13 #include "ui/gfx/geometry/rect.h"
14 #include "ui/gfx/geometry/size.h"
14 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
15 #include "ui/gfx/size.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
17 17
18 namespace ash { 18 namespace ash {
19 19
20 TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root) 20 TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root)
21 : display_id_(GetRootWindowSettings(initial_root)->display_id), 21 : display_id_(GetRootWindowSettings(initial_root)->display_id),
22 root_window_(initial_root), 22 root_window_(initial_root),
23 widget_(NULL) { 23 widget_(NULL) {
24 const gfx::Display& display = 24 const gfx::Display& display =
25 Shell::GetInstance()->display_manager()->GetDisplayForId(display_id_); 25 Shell::GetInstance()->display_manager()->GetDisplayForId(display_id_);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 widget_->GetNativeView(), 143 widget_->GetNativeView(),
144 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer)); 144 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
145 145
146 RootWindowController* controller = GetRootWindowController(root_window_); 146 RootWindowController* controller = GetRootWindowController(root_window_);
147 SetHudForRootWindowController(controller); 147 SetHudForRootWindowController(controller);
148 148
149 root_window_->AddPreTargetHandler(this); 149 root_window_->AddPreTargetHandler(this);
150 } 150 }
151 151
152 } // namespace ash 152 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch/touch_hud_projection.cc ('k') | ash/touch/touch_uma.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698