ash/virtual_keyboard_controller.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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/virtual_keyboard_controller.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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/test/tray_cast_test_api.cc ('k') | ash/virtual_keyboard_controller_unittest.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/virtual_keyboard_controller.h"	5 #include "ash/virtual_keyboard_controller.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "ash/common/keyboard/keyboard_ui.h"	9 #include "ash/common/keyboard/keyboard_ui.h"

10 #include "ash/common/system/tray/system_tray_notifier.h"

11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"	10 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

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

13 #include "ash/common/wm_window.h"	12 #include "ash/common/wm_window.h"

14 #include "ash/root_window_controller.h"	13 #include "ash/root_window_controller.h"

15 #include "ash/shell.h"	14 #include "ash/shell.h"

	15 #include "ash/system/tray/system_tray_notifier.h"

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

17 #include "base/strings/string_util.h"	17 #include "base/strings/string_util.h"

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

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

20 #include "ui/events/devices/input_device.h"	20 #include "ui/events/devices/input_device.h"

21 #include "ui/events/devices/input_device_manager.h"	21 #include "ui/events/devices/input_device_manager.h"

22 #include "ui/events/devices/touchscreen_device.h"	22 #include "ui/events/devices/touchscreen_device.h"

23 #include "ui/keyboard/keyboard_controller.h"	23 #include "ui/keyboard/keyboard_controller.h"

24 #include "ui/keyboard/keyboard_switches.h"	24 #include "ui/keyboard/keyboard_switches.h"

25 #include "ui/keyboard/keyboard_util.h"	25 #include "ui/keyboard/keyboard_util.h"

(...skipping 186 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
212 if (is_enabled == was_enabled)	212 if (is_enabled == was_enabled)

213 return;	213 return;

214 if (is_enabled) {	214 if (is_enabled) {

215 Shell::GetInstance()->CreateKeyboard();	215 Shell::GetInstance()->CreateKeyboard();

216 } else {	216 } else {

217 Shell::GetInstance()->DeactivateKeyboard();	217 Shell::GetInstance()->DeactivateKeyboard();

218 }	218 }

219 }	219 }

220	220

221 } // namespace ash	221 } // namespace ash

OLD	NEW