Revert of Remove some ifdefs from ash since it only supports ChromeOS now.

ash/display/display_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_util.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/new_window_controller.h"
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/extended_mouse_warp_controller.h"
 #include "ash/display/null_mouse_warp_controller.h"
 #include "ash/display/unified_mouse_warp_controller.h"
 #include "ash/host/ash_window_tree_host.h"
-#include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/sys_info.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
-#include "ui/gfx/paint_vector_icon.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/resources/vector_icons/vector_icons.h"
+#include "base/sys_info.h"
+#include "ui/gfx/paint_vector_icon.h"
+#endif
+
 namespace ash {
 namespace {
 
 const char kDisplayErrorNotificationId[] = "chrome://settings/display/error";
 
+#if defined(OS_CHROMEOS)
 // TODO(glevin): These are for new MD vector icons, but are using pre-MD color
 // scheme. When we switch to all MD icons for notifications, these should be
 // updated to use MD color scheme.
 const SkColor kDisplayIconColor = SkColorSetRGB(0xBD, 0xBD, 0xBD);
 const SkColor kFeedbackIconColor = SkColorSetRGB(0x96, 0x96, 0x98);
+#endif
 
 // A notification delegate that will start the feedback app when the notication
 // is clicked.
 class DisplayErrorNotificationDelegate
     : public message_center::NotificationDelegate {
  public:
   DisplayErrorNotificationDelegate() = default;
 
   // message_center::NotificationDelegate:
   void ButtonClick(int index) override {
@@ skipping 100 matching lines @@
     } else {
       new_point_in_screen = point_in_native;
       host->ConvertScreenInPixelsToDIP(&new_point_in_screen);
       ::wm::ConvertPointToScreen(host->window(), &new_point_in_screen);
     }
     aura::Env::GetInstance()->set_last_mouse_location(new_point_in_screen);
   }
 }
 
 
+#if defined(OS_CHROMEOS)
 void ShowDisplayErrorNotification(const base::string16& message,
                                   bool allow_feedback) {
   // Always remove the notification to make sure the notification appears
   // as a popup in any situation.
   message_center::MessageCenter::Get()->RemoveNotification(
       kDisplayErrorNotificationId, false /* by_user */);
 
   message_center::RichNotificationData data;
   if (allow_feedback) {
     message_center::ButtonInfo send_button(
@@ skipping 10 matching lines @@
           message, gfx::Image(CreateVectorIcon(kNotificationDisplayErrorIcon,
                                                kDisplayIconColor)),
           base::string16(),  // display_source
           GURL(), message_center::NotifierId(
                       message_center::NotifierId::SYSTEM_COMPONENT,
                       system_notifier::kNotifierDisplayError),
           data, new DisplayErrorNotificationDelegate));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
+#endif
 
 base::string16 GetDisplayErrorNotificationMessageForTest() {
   message_center::NotificationList::Notifications notifications =
       message_center::MessageCenter::Get()->GetVisibleNotifications();
   for (auto* const notification : notifications) {
     if (notification->id() == kDisplayErrorNotificationId)
       return notification->message();
   }
   return base::string16();
 }
 
 }  // namespace ash