Revert of Give user ability to file a feedback report from the display error notification.

ash/display/display_error_observer_chromeos.cc

 // Copyright 2013 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_error_observer_chromeos.h"
 
-#include <cinttypes>
 #include <utility>
 
-#include "ash/new_window_delegate.h"
-#include "ash/shell.h"
 #include "ash/system/system_notifier.h"
-#include "base/strings/string_number_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.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"
 
 using message_center::Notification;
 
 namespace ash {
 namespace {
 
 const char kDisplayErrorNotificationId[] = "chrome://settings/display/error";
 
-// 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 {
-    ash::Shell::GetInstance()->new_window_delegate()->OpenFeedbackPage();
-  }
-
- private:
-  // Private destructor since NotificationDelegate is ref-counted.
-  ~DisplayErrorNotificationDelegate() override = default;
-
-  DISALLOW_COPY_AND_ASSIGN(DisplayErrorNotificationDelegate);
-};
-
 }  // namespace
 
 DisplayErrorObserver::DisplayErrorObserver() {
 }
 
 DisplayErrorObserver::~DisplayErrorObserver() {
 }
 
 void DisplayErrorObserver::OnDisplayModeChangeFailed(
     const ui::DisplayConfigurator::DisplayStateList& displays,
     ui::MultipleDisplayState new_state) {
-  LOG(ERROR) << "Failed to configure the following display(s):";
-  for (const auto& display : displays) {
-    LOG(ERROR) << "- Display with ID = " << display->display_id()
-               << ", and EDID = " << base::HexEncode(display->edid().data(),
-                                                     display->edid().size())
-               << ".";
-  }
-
   // 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 */);
 
   int message_id = (new_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR) ?
       IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING :
       IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING;
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   scoped_ptr<Notification> notification(new Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, kDisplayErrorNotificationId,
       base::string16(),  // title
       l10n_util::GetStringUTF16(message_id),
       bundle.GetImageNamed(IDR_AURA_NOTIFICATION_DISPLAY),
       base::string16(),  // display_source
       GURL(),
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  system_notifier::kNotifierDisplayError),
-      message_center::RichNotificationData(),
-      new DisplayErrorNotificationDelegate));
+      message_center::RichNotificationData(), NULL));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 base::string16
 DisplayErrorObserver::GetDisplayErrorNotificationMessageForTest() {
   message_center::NotificationList::Notifications notifications =
       message_center::MessageCenter::Get()->GetVisibleNotifications();
   for (message_center::NotificationList::Notifications::const_iterator iter =
            notifications.begin(); iter != notifications.end(); ++iter) {
     if ((*iter)->id() == kDisplayErrorNotificationId)
       return (*iter)->message();
   }
 
   return base::string16();
 }
 
 }  // namespace ash