| Index: ash/system/settings/tray_settings.h
|
| diff --git a/ash/common/system/chromeos/settings/tray_settings.h b/ash/system/settings/tray_settings.h
|
| similarity index 81%
|
| rename from ash/common/system/chromeos/settings/tray_settings.h
|
| rename to ash/system/settings/tray_settings.h
|
| index 974856c3eb91642fb7c02c7727d849a33a218530..8d016567cb46d03ff11b8e89bf0403f4a6a03eff 100644
|
| --- a/ash/common/system/chromeos/settings/tray_settings.h
|
| +++ b/ash/system/settings/tray_settings.h
|
| @@ -2,10 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
|
| -#define ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
|
| +#ifndef ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
|
| +#define ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
|
|
|
| -#include "ash/common/system/tray/system_tray_item.h"
|
| +#include "ash/system/tray/system_tray_item.h"
|
| #include "base/macros.h"
|
|
|
| namespace ash {
|
| @@ -37,4 +37,4 @@ class TraySettings : public SystemTrayItem {
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_
|
| +#endif // ASH_SYSTEM_SETTINGS_TRAY_SETTINGS_H_
|
|
|