| Index: ash/system/palette/palette_tray.cc
|
| diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
|
| similarity index 93%
|
| rename from ash/common/system/chromeos/palette/palette_tray.cc
|
| rename to ash/system/palette/palette_tray.cc
|
| index b63ad7e5937d4a3fd8214e5c99ec2b7b26941f0f..6324bc35aebdc942099574f8d72715874855fbfc 100644
|
| --- a/ash/common/system/chromeos/palette/palette_tray.cc
|
| +++ b/ash/system/palette/palette_tray.cc
|
| @@ -2,29 +2,29 @@
|
| // 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/palette/palette_tray.h"
|
| -
|
| -#include "ash/common/material_design/material_design_controller.h"
|
| -#include "ash/common/session/session_state_delegate.h"
|
| -#include "ash/common/shelf/shelf_constants.h"
|
| -#include "ash/common/shelf/wm_shelf.h"
|
| -#include "ash/common/shelf/wm_shelf_util.h"
|
| -#include "ash/common/system/chromeos/palette/palette_tool_manager.h"
|
| -#include "ash/common/system/chromeos/palette/palette_utils.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/tray_bubble_wrapper.h"
|
| -#include "ash/common/system/tray/tray_constants.h"
|
| -#include "ash/common/system/tray/tray_popup_header_button.h"
|
| -#include "ash/common/system/tray/tray_popup_item_style.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| +#include "ash/system/palette/palette_tray.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/resources/vector_icons/vector_icons.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/session/session_state_delegate.h"
|
| +#include "ash/shelf/shelf_constants.h"
|
| +#include "ash/shelf/wm_shelf.h"
|
| +#include "ash/shelf/wm_shelf_util.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| +#include "ash/system/palette/palette_tool_manager.h"
|
| +#include "ash/system/palette/palette_utils.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/tray_bubble_wrapper.h"
|
| +#include "ash/system/tray/tray_constants.h"
|
| +#include "ash/system/tray/tray_popup_header_button.h"
|
| +#include "ash/system/tray/tray_popup_item_style.h"
|
| +#include "ash/wm_shell.h"
|
| +#include "ash/wm_window.h"
|
| #include "base/metrics/histogram_macros.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|