| Index: ash/system/tray/tray_popup_utils.h
|
| diff --git a/ash/common/system/tray/tray_popup_utils.h b/ash/system/tray/tray_popup_utils.h
|
| similarity index 96%
|
| rename from ash/common/system/tray/tray_popup_utils.h
|
| rename to ash/system/tray/tray_popup_utils.h
|
| index ecec2227b9618b85c8cbc0315ec7c4be3eb0b3ce..b956810bc1dac633a98c8c490350c633e96bb4dc 100644
|
| --- a/ash/common/system/tray/tray_popup_utils.h
|
| +++ b/ash/system/tray/tray_popup_utils.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
|
| -#define ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
|
| +#ifndef ASH_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
|
| +#define ASH_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
|
|
|
| #include <memory>
|
|
|
| -#include "ash/common/login_status.h"
|
| -#include "ash/common/system/tray/tray_constants.h"
|
| -#include "ash/common/system/tray/tray_popup_ink_drop_style.h"
|
| -#include "ash/common/system/tray/tri_view.h"
|
| +#include "ash/login_status.h"
|
| +#include "ash/system/tray/tray_constants.h"
|
| +#include "ash/system/tray/tray_popup_ink_drop_style.h"
|
| +#include "ash/system/tray/tri_view.h"
|
| #include "base/strings/string16.h"
|
|
|
| namespace views {
|
| @@ -218,4 +218,4 @@ class TrayPopupUtils {
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
|
| +#endif // ASH_SYSTEM_TRAY_TRAY_POPUP_UTILS_H_
|
|
|