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

Side by Side Diff: ash/virtual_keyboard_controller.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
OLDNEW
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/keyboard/keyboard_ui.h" 9 #include "ash/keyboard/keyboard_ui.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/tray/system_tray_notifier.h" 12 #include "ash/system/tray/system_tray_notifier.h"
13 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
14 #include "ash/wm/window_util.h" 14 #include "ash/wm/window_util.h"
15 #include "ash/wm_shell.h"
16 #include "ash/wm_window.h" 15 #include "ash/wm_window.h"
17 #include "base/command_line.h" 16 #include "base/command_line.h"
18 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
19 #include "ui/display/display.h" 18 #include "ui/display/display.h"
20 #include "ui/display/screen.h" 19 #include "ui/display/screen.h"
21 #include "ui/events/devices/input_device.h" 20 #include "ui/events/devices/input_device.h"
22 #include "ui/events/devices/input_device_manager.h" 21 #include "ui/events/devices/input_device_manager.h"
23 #include "ui/events/devices/touchscreen_device.h" 22 #include "ui/events/devices/touchscreen_device.h"
24 #include "ui/keyboard/keyboard_controller.h" 23 #include "ui/keyboard/keyboard_controller.h"
25 #include "ui/keyboard/keyboard_switches.h" 24 #include "ui/keyboard/keyboard_switches.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 if (is_enabled == was_enabled) 210 if (is_enabled == was_enabled)
212 return; 211 return;
213 if (is_enabled) { 212 if (is_enabled) {
214 Shell::Get()->CreateKeyboard(); 213 Shell::Get()->CreateKeyboard();
215 } else { 214 } else {
216 Shell::Get()->DeactivateKeyboard(); 215 Shell::Get()->DeactivateKeyboard();
217 } 216 }
218 } 217 }
219 218
220 } // namespace ash 219 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698