Index: ash/common/system/date/system_info_default_view.cc |
diff --git a/ash/common/system/date/system_info_default_view.cc b/ash/common/system/date/system_info_default_view.cc |
index b525fedd273617047651c41ca26c40c8a2a5d21d..c0046d4e4215cfd5062c74a2ea064b0c7b837bc8 100644 |
--- a/ash/common/system/date/system_info_default_view.cc |
+++ b/ash/common/system/date/system_info_default_view.cc |
@@ -4,6 +4,8 @@ |
#include "ash/common/system/date/system_info_default_view.h" |
+#include "ash/common/system/chromeos/power/power_status.h" |
+#include "ash/common/system/chromeos/power/power_status_view.h" |
#include "ash/common/system/date/date_view.h" |
#include "ash/common/system/tray/tray_constants.h" |
#include "ash/common/system/tray/tray_popup_utils.h" |
@@ -13,11 +15,6 @@ |
#include "ui/views/layout/box_layout.h" |
#include "ui/views/layout/fill_layout.h" |
-#if defined(OS_CHROMEOS) |
-#include "ash/common/system/chromeos/power/power_status.h" |
-#include "ash/common/system/chromeos/power/power_status_view.h" |
-#endif // defined(OS_CHROMEOS) |
- |
namespace ash { |
// The minimum number of menu button widths that the date view should span |
@@ -38,7 +35,6 @@ SystemInfoDefaultView::SystemInfoDefaultView(SystemTrayItem* owner, |
date_view_ = new tray::DateView(owner); |
tri_view_->AddView(TriView::Container::START, date_view_); |
-#if defined(OS_CHROMEOS) |
if (PowerStatus::Get()->IsBatteryPresent()) { |
power_status_view_ = new ash::PowerStatusView(false); |
std::unique_ptr<views::BoxLayout> box_layout = |
@@ -55,7 +51,6 @@ SystemInfoDefaultView::SystemInfoDefaultView(SystemTrayItem* owner, |
TrayPopupUtils::CreateVerticalSeparator()); |
tri_view_->AddView(TriView::Container::CENTER, power_status_view_); |
} |
-#endif // defined(OS_CHROMEOS) |
tri_view_->SetContainerVisible(TriView::Container::END, false); |
if (TrayPopupUtils::CanOpenWebUISettings(login)) |