Merge "Drop '#include "ui.h"' from device.h."

am: 2de12da142 Change-Id: I339621dbc9c8cebe78fa7bcf30e9c7e070e649af
2018-04-30 19:04:03 -07:00
parent 040674586b 2de12da142
commit 7e61191258
2 changed files with 4 additions and 1 deletions
@@ -16,6 +16,8 @@

 #include "device.h"

+#include "ui.h"
+
 static const char* MENU_ITEMS[] = {
  "Reboot system now",
  "Reboot to bootloader",
@@ -17,7 +17,8 @@
 #ifndef _RECOVERY_DEVICE_H
 #define _RECOVERY_DEVICE_H

-#include "ui.h"
+// Forward declaration to avoid including "ui.h".
+class RecoveryUI;

 class Device {
 public: