commit 2de12da142af4dc8386ea3b6838d3e10ea9bf20a
author Tao Bao <tbao@google.com> Tue May 01 01:54:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 01 01:54:45 2018 +0000
tree 70d96e99ec327a6a6ef328193c6d880252668bc8
parent e4d65b681a58f30df2b38b95434f6a21555db6a5
parent c16fd8a9316f2c8549b34a61cf6091072de54319

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

device.cpp

diff --git a/device.cpp b/device.cpp
index f881daf..3b0942c 100644
--- a/device.cpp
+++ b/device.cpp
@@ -16,6 +16,8 @@
 
 #include "device.h"
 
+#include "ui.h"
+
 static const char* MENU_ITEMS[] = {
   "Reboot system now",
   "Reboot to bootloader",

device.h

diff --git a/device.h b/device.h
index 74745b3..4ea3159 100644
--- a/device.h
+++ b/device.h
@@ -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: