| Index: ash/system/ime_menu/ime_menu_tray.cc
|
| diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc
|
| similarity index 95%
|
| rename from ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
|
| rename to ash/system/ime_menu/ime_menu_tray.cc
|
| index b683e1c20468709ad4426520251b68bcf8f7aabd..80e6c5e25a62a16a6ed29b08a617ab360d404f0c 100644
|
| --- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
|
| +++ b/ash/system/ime_menu/ime_menu_tray.cc
|
| @@ -2,30 +2,30 @@
|
| // 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/ime_menu/ime_menu_tray.h"
|
| -
|
| -#include "ash/common/accessibility_delegate.h"
|
| -#include "ash/common/ash_constants.h"
|
| -#include "ash/common/material_design/material_design_controller.h"
|
| -#include "ash/common/session/session_state_delegate.h"
|
| -#include "ash/common/shelf/wm_shelf.h"
|
| -#include "ash/common/shelf/wm_shelf_util.h"
|
| -#include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
|
| -#include "ash/common/system/tray/hover_highlight_view.h"
|
| -#include "ash/common/system/tray/system_menu_button.h"
|
| -#include "ash/common/system/tray/system_tray_controller.h"
|
| -#include "ash/common/system/tray/system_tray_delegate.h"
|
| -#include "ash/common/system/tray/system_tray_notifier.h"
|
| -#include "ash/common/system/tray/tray_constants.h"
|
| -#include "ash/common/system/tray/tray_popup_item_style.h"
|
| -#include "ash/common/system/tray/tray_popup_utils.h"
|
| -#include "ash/common/system/tray/tray_utils.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| +#include "ash/system/ime_menu/ime_menu_tray.h"
|
| +
|
| +#include "ash/accessibility_delegate.h"
|
| +#include "ash/ash_constants.h"
|
| +#include "ash/material_design/material_design_controller.h"
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/resources/grit/ash_resources.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/session/session_state_delegate.h"
|
| +#include "ash/shelf/wm_shelf.h"
|
| +#include "ash/shelf/wm_shelf_util.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| +#include "ash/system/ime_menu/ime_list_view.h"
|
| +#include "ash/system/tray/hover_highlight_view.h"
|
| +#include "ash/system/tray/system_menu_button.h"
|
| +#include "ash/system/tray/system_tray_controller.h"
|
| +#include "ash/system/tray/system_tray_delegate.h"
|
| +#include "ash/system/tray/system_tray_notifier.h"
|
| +#include "ash/system/tray/tray_constants.h"
|
| +#include "ash/system/tray/tray_popup_item_style.h"
|
| +#include "ash/system/tray/tray_popup_utils.h"
|
| +#include "ash/system/tray/tray_utils.h"
|
| +#include "ash/wm_shell.h"
|
| +#include "ash/wm_window.h"
|
| #include "base/metrics/histogram_macros.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "ui/base/ime/chromeos/input_method_manager.h"
|
|
|