| Index: ash/system/virtual_keyboard/virtual_keyboard_tray.cc
|
| diff --git a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
|
| similarity index 92%
|
| rename from ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| rename to ash/system/virtual_keyboard/virtual_keyboard_tray.cc
|
| index 916499de444dd55ea8d9539d01d1067de4a0567e..894feee8a3f350a3a1006694bcb63b0a0d381c43 100644
|
| --- a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| +++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
|
| +#include "ash/system/virtual_keyboard/virtual_keyboard_tray.h"
|
|
|
| #include <algorithm>
|
|
|
| -#include "ash/common/keyboard/keyboard_ui.h"
|
| -#include "ash/common/shelf/shelf_constants.h"
|
| -#include "ash/common/shelf/wm_shelf.h"
|
| -#include "ash/common/system/tray/tray_constants.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| +#include "ash/keyboard/keyboard_ui.h"
|
| #include "ash/resources/vector_icons/vector_icons.h"
|
| +#include "ash/shelf/shelf_constants.h"
|
| +#include "ash/shelf/wm_shelf.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| +#include "ash/system/tray/tray_constants.h"
|
| +#include "ash/wm_shell.h"
|
| +#include "ash/wm_window.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/display/display.h"
|
| #include "ui/events/event.h"
|
|
|