Improve monitor compatibility error, move feedback link into button

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/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/public/interfaces/new_window.mojom.h"
 #include "ash/shell.h"
 #include "base/strings/string_number_conversions.h"
-#include "grit/ash_resources.h"
+#include "base/strings/utf_string_conversions.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/base/resource/resource_bundle.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/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: These are for new MD vector icons, but are using pre-MD color scheme.

[Evan Stade, 2016/12/05 22:53:10]

please put your name in the TODO (to indicate you are the author/have more
context should someone have questions)

[Greg Levin, 2016/12/06 22:44:49]

Done.  Although... I had always thought the name was for who would be doing the
work (as the author can be found via code search).  Since I'm not involved in
the larger vectorization effort, I didn't know if my name should be here or not.
(Also, is there an issue attached to that effort that I could reference here?)

[Evan Stade, 2016/12/06 23:42:18]

I certainly hope that I'm not on the hook for all the TODO(estade)s out there!
In my book, the name indicates authorship first and responsibility second, if at
all.

[Greg Levin, 2016/12/12 22:36:43]

Acknowledged.

+// When we switch to all MD icons for notifications, these should be updated to
+// use MD color scheme.
+const SkColor kDisplayIconColor = 0xFFBDBDBD;

[Evan Stade, 2016/12/05 22:53:10]

nit: SkColorSetRGB(0xBD, 0xBD, 0xBD);

(similar below)

[Greg Levin, 2016/12/06 22:44:49]

Done.

+const SkColor kFeedbackIconColor = 0xFF969698;
+#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:
-  bool HasClickedListener() override { return true; }
-
-  void Click() override {
+  void ButtonClick(int index) override {
+    DCHECK_EQ(0, index);
     WmShell::Get()->new_window_client()->OpenFeedbackPage();
   }
 
  private:
   // Private destructor since NotificationDelegate is ref-counted.
   ~DisplayErrorNotificationDelegate() override = default;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayErrorNotificationDelegate);
 };
 
@@ skipping 90 matching lines @@
       new_point_in_screen = point_in_native;
       host->ConvertPointFromNativeScreen(&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(int message_id) {
+void ShowDisplayErrorNotification(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 */);
 
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  message_center::RichNotificationData optional_field;
+  if (allow_feedback) {
+    message_center::ButtonInfo send_button(
+        l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_SEND_FEEDBACK));
+    send_button.icon = gfx::Image(
+        CreateVectorIcon(kNotificationFeedbackIcon, kFeedbackIconColor));
+    optional_field.buttons.push_back(send_button);
+  }
+
   std::unique_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE, kDisplayErrorNotificationId,
           base::string16(),  // title
-          l10n_util::GetStringUTF16(message_id),
-          bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY),
+          message, gfx::Image(CreateVectorIcon(kDisplayNotificationIcon,
+                                               kDisplayIconColor)),
           base::string16(),  // display_source
           GURL(), message_center::NotifierId(
                       message_center::NotifierId::SYSTEM_COMPONENT,
                       system_notifier::kNotifierDisplayError),
-          message_center::RichNotificationData(),
-          new DisplayErrorNotificationDelegate));
+          optional_field, 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