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

Side by Side Diff: ash/virtual_keyboard_controller_unittest.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
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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/ash_switches.h" 10 #include "ash/common/ash_switches.h"
11 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer. h" 11 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer. h"
12 #include "ash/common/system/tray/wm_system_tray_notifier.h" 12 #include "ash/common/system/tray/system_tray_notifier.h"
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
16 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 16 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
17 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" 17 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
18 #include "base/command_line.h" 18 #include "base/command_line.h"
19 #include "ui/events/devices/device_data_manager.h" 19 #include "ui/events/devices/device_data_manager.h"
20 #include "ui/events/devices/device_hotplug_event_observer.h" 20 #include "ui/events/devices/device_hotplug_event_observer.h"
21 #include "ui/events/devices/input_device.h" 21 #include "ui/events/devices/input_device.h"
22 #include "ui/events/devices/touchscreen_device.h" 22 #include "ui/events/devices/touchscreen_device.h"
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 UpdateTouchscreenDevices(screens); 339 UpdateTouchscreenDevices(screens);
340 std::vector<ui::InputDevice> keyboard_devices; 340 std::vector<ui::InputDevice> keyboard_devices;
341 keyboard_devices.push_back(ui::InputDevice( 341 keyboard_devices.push_back(ui::InputDevice(
342 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); 342 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
343 UpdateKeyboardDevices(keyboard_devices); 343 UpdateKeyboardDevices(keyboard_devices);
344 ASSERT_TRUE(keyboard::IsKeyboardEnabled()); 344 ASSERT_TRUE(keyboard::IsKeyboardEnabled());
345 } 345 }
346 346
347 } // namespace test 347 } // namespace test
348 } // namespace ash 348 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698