ash/display/cursor_window_controller.cc - Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/display/cursor_window_controller.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: add back static_assert 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

« ash/common/shell_window_ids.h ('K') | « ash/desktop_background/desktop_background_view.cc ('k') | ash/display/display_animator_chromeos.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/display/cursor_window_controller.h"	5 #include "ash/display/cursor_window_controller.h"

6	6

	7 #include "ash/common/shell_window_ids.h"

7 #include "ash/display/display_manager.h"	8 #include "ash/display/display_manager.h"

8 #include "ash/display/mirror_window_controller.h"	9 #include "ash/display/mirror_window_controller.h"

9 #include "ash/display/window_tree_host_manager.h"	10 #include "ash/display/window_tree_host_manager.h"

10 #include "ash/root_window_controller.h"	11 #include "ash/root_window_controller.h"

11 #include "ash/shell.h"	12 #include "ash/shell.h"

12 #include "ash/shell_window_ids.h"

13 #include "ui/aura/env.h"	13 #include "ui/aura/env.h"

14 #include "ui/aura/window_delegate.h"	14 #include "ui/aura/window_delegate.h"

15 #include "ui/aura/window_event_dispatcher.h"	15 #include "ui/aura/window_event_dispatcher.h"

16 #include "ui/base/cursor/cursors_aura.h"	16 #include "ui/base/cursor/cursors_aura.h"

17 #include "ui/base/hit_test.h"	17 #include "ui/base/hit_test.h"

18 #include "ui/base/resource/resource_bundle.h"	18 #include "ui/base/resource/resource_bundle.h"

19 #include "ui/compositor/dip_util.h"	19 #include "ui/compositor/dip_util.h"

20 #include "ui/compositor/paint_recorder.h"	20 #include "ui/compositor/paint_recorder.h"

21 #include "ui/display/display.h"	21 #include "ui/display/display.h"

22 #include "ui/display/screen.h"	22 #include "ui/display/screen.h"

(...skipping 265 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
288 cursor_window_->Show();	288 cursor_window_->Show();

289 else	289 else

290 cursor_window_->Hide();	290 cursor_window_->Hide();

291 }	291 }

292	292

293 const gfx::ImageSkia& CursorWindowController::GetCursorImageForTest() const {	293 const gfx::ImageSkia& CursorWindowController::GetCursorImageForTest() const {

294 return delegate_->cursor_image();	294 return delegate_->cursor_image();

295 }	295 }

296	296

297 } // namespace ash	297 } // namespace ash

OLD	NEW