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

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

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common
Patch Set: merge Created 4 years, 6 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/test/test_shell_delegate.cc ('k') | ash/utility/screenshot_controller.cc » ('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/common/shell_window_ids.h"
7 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
8 #include "ash/root_window_settings.h" 9 #include "ash/root_window_settings.h"
9 #include "ash/shell.h" 10 #include "ash/shell.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/display/display.h" 12 #include "ui/display/display.h"
13 #include "ui/display/screen.h" 13 #include "ui/display/screen.h"
14 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
15 #include "ui/gfx/geometry/size.h" 15 #include "ui/gfx/geometry/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)
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 widget_->GetNativeView(), 144 widget_->GetNativeView(),
145 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer)); 145 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
146 146
147 RootWindowController* controller = GetRootWindowController(root_window_); 147 RootWindowController* controller = GetRootWindowController(root_window_);
148 SetHudForRootWindowController(controller); 148 SetHudForRootWindowController(controller);
149 149
150 root_window_->AddPreTargetHandler(this); 150 root_window_->AddPreTargetHandler(this);
151 } 151 }
152 152
153 } // namespace ash 153 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | ash/utility/screenshot_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698