ash/virtual_keyboard_controller.cc - Issue 2098023002: mash: Migrate remaining tray observers and notify functions.

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 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 5 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/shell.h ('K') | « ash/virtual_keyboard_controller.h ('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/ash_switches.h"	9 #include "ash/common/ash_switches.h"

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

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

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

13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"	13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

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

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

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

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

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

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

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

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

130 return;	130 return;

131 if (is_enabled) {	131 if (is_enabled) {

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

133 } else {	133 } else {

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

135 }	135 }

136 }	136 }

137	137

138 } // namespace ash	138 } // namespace ash

OLD	NEW