ash/magnifier/magnification_controller.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/magnifier/magnification_controller.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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/login_status.h ('k') | ash/magnifier/magnification_controller_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/magnifier/magnification_controller.h"	5 #include "ash/magnifier/magnification_controller.h"

6	6

7 #include <memory>	7 #include <memory>

8 #include <utility>	8 #include <utility>

9	9

10 #include "ash/accelerators/accelerator_controller.h"	10 #include "ash/accelerators/accelerator_controller.h"

11 #include "ash/accessibility_delegate.h"	11 #include "ash/common/accessibility_delegate.h"

	12 #include "ash/common/wm_shell.h"

12 #include "ash/display/root_window_transformers.h"	13 #include "ash/display/root_window_transformers.h"

13 #include "ash/host/ash_window_tree_host.h"	14 #include "ash/host/ash_window_tree_host.h"

14 #include "ash/host/root_window_transformer.h"	15 #include "ash/host/root_window_transformer.h"

15 #include "ash/root_window_controller.h"	16 #include "ash/root_window_controller.h"

16 #include "ash/shell.h"	17 #include "ash/shell.h"

17 #include "ash/system/tray/system_tray_delegate.h"	18 #include "ash/system/tray/system_tray_delegate.h"

18 #include "ash/wm_shell.h"

19 #include "base/command_line.h"	19 #include "base/command_line.h"

20 #include "base/synchronization/waitable_event.h"	20 #include "base/synchronization/waitable_event.h"

21 #include "base/timer/timer.h"	21 #include "base/timer/timer.h"

22 #include "chromeos/chromeos_switches.h"	22 #include "chromeos/chromeos_switches.h"

23 #include "ui/aura/client/cursor_client.h"	23 #include "ui/aura/client/cursor_client.h"

24 #include "ui/aura/window.h"	24 #include "ui/aura/window.h"

25 #include "ui/aura/window_tree_host.h"	25 #include "ui/aura/window_tree_host.h"

26 #include "ui/base/ime/input_method.h"	26 #include "ui/base/ime/input_method.h"

27 #include "ui/base/ime/input_method_observer.h"	27 #include "ui/base/ime/input_method_observer.h"

28 #include "ui/base/ime/text_input_client.h"	28 #include "ui/base/ime/text_input_client.h"

(...skipping 857 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
886	886

887 ////////////////////////////////////////////////////////////////////////////////	887 ////////////////////////////////////////////////////////////////////////////////

888 // MagnificationController:	888 // MagnificationController:

889	889

890 // static	890 // static

891 MagnificationController* MagnificationController::CreateInstance() {	891 MagnificationController* MagnificationController::CreateInstance() {

892 return new MagnificationControllerImpl();	892 return new MagnificationControllerImpl();

893 }	893 }

894	894

895 } // namespace ash	895 } // namespace ash

OLD	NEW