Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2315)

Unified Diff: ash/common/system/chromeos/power/tray_power.h

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/chromeos/power/tray_power.h
diff --git a/ash/system/chromeos/power/tray_power.h b/ash/common/system/chromeos/power/tray_power.h
similarity index 93%
rename from ash/system/chromeos/power/tray_power.h
rename to ash/common/system/chromeos/power/tray_power.h
index 4f47be894555a300944a4c2313a7ebe41fb1ed13..9ad7516c327f5818f8660e3aef02a8fcbbf4809e 100644
--- a/ash/system/chromeos/power/tray_power.h
+++ b/ash/common/system/chromeos/power/tray_power.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
#include <memory>
+#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/tray/system_tray_item.h"
-#include "ash/system/chromeos/power/power_status.h"
#include "base/macros.h"
class SkBitmap;
@@ -121,4 +121,4 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_

Powered by Google App Engine
This is Rietveld 408576698