Index: ash/system/settings/tray_settings.cc |
diff --git a/ash/common/system/chromeos/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc |
similarity index 91% |
rename from ash/common/system/chromeos/settings/tray_settings.cc |
rename to ash/system/settings/tray_settings.cc |
index 4b613ffc97878ea70cf4ed2cc4a484ad146037de..6678414945854cb76d9af2653e24f11b77b2b2cc 100644 |
--- a/ash/common/system/chromeos/settings/tray_settings.cc |
+++ b/ash/system/settings/tray_settings.cc |
@@ -2,21 +2,21 @@ |
// 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/settings/tray_settings.h" |
+#include "ash/system/settings/tray_settings.h" |
#include "ash/common/material_design/material_design_controller.h" |
#include "ash/common/session/session_state_delegate.h" |
-#include "ash/common/system/chromeos/power/power_status.h" |
-#include "ash/common/system/chromeos/power/power_status_view.h" |
-#include "ash/common/system/tray/actionable_view.h" |
-#include "ash/common/system/tray/fixed_sized_image_view.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_constants.h" |
-#include "ash/common/system/tray/tray_popup_utils.h" |
#include "ash/common/wm_shell.h" |
#include "ash/resources/grit/ash_resources.h" |
#include "ash/strings/grit/ash_strings.h" |
+#include "ash/system/power/power_status.h" |
+#include "ash/system/power/power_status_view.h" |
+#include "ash/system/tray/actionable_view.h" |
+#include "ash/system/tray/fixed_sized_image_view.h" |
+#include "ash/system/tray/system_tray_controller.h" |
+#include "ash/system/tray/system_tray_delegate.h" |
+#include "ash/system/tray/tray_constants.h" |
+#include "ash/system/tray/tray_popup_utils.h" |
#include "base/logging.h" |
#include "base/strings/utf_string_conversions.h" |
#include "third_party/skia/include/core/SkColor.h" |