Remove docked-mode notification

ash/system/chromeos/screen_layout_observer.cc

 // Copyright (c) 2012 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/system/chromeos/screen_layout_observer.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 134 matching lines @@
     if (display::Display::IsInternalDisplayId(
             display_manager->GetDisplayAt(i).id())) {
       return false;
     }
   }
 
   // We have an internal display but it's not one of the active displays.
   return true;
 }
 
-// Returns the notification message that should be shown to the user when the
-// docked mode is entered.
-base::string16 GetDockedModeEnabledMessage(
-    base::string16* out_additional_message) {
-  DCHECK(IsDockedModeEnabled());
-  DCHECK(out_additional_message);
-
-  *out_additional_message = ash::SubstituteChromeOSDeviceType(
-      IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION);
-  return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED);
-}
-
 // Returns the notification message that should be shown when mirror display
 // mode is entered.
 base::string16 GetEnterMirrorModeMessage() {
   if (display::Display::HasInternalDisplay()) {
     return l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING,
         GetDisplayName(GetDisplayManager()->mirroring_display_id()));
   }
 
   return l10n_util::GetStringUTF16(
@@ skipping 76 matching lines @@
     // Detect changes in the unified mode status.
     if (current_display_mode_ == DisplayMode::UNIFIED) {
       *out_message = GetEnterUnifiedModeMessage();
       return true;
     }
     if (old_display_mode_ == DisplayMode::UNIFIED) {
       *out_message = GetExitUnifiedModeMessage();
       return true;
     }
 
-    if (current_display_mode_ == DisplayMode::DOCKED) {
-      *out_message = GetDockedModeEnabledMessage(out_additional_message);
-      return true;
-    }
-    if (old_display_mode_ == DisplayMode::DOCKED) {
-      *out_message =
-          l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_EXITING);
-      return true;
+    if (current_display_mode_ == DisplayMode::DOCKED ||
+        old_display_mode_ == DisplayMode::DOCKED) {
+      // We no longer show any notification for docked mode events.
+      // crbug.com/674719.
+      return false;
     }
   }
 
   // Displays are added or removed.
   if (display_info_.size() < old_info.size()) {
     // A display has been removed.
     for (const auto& iter : old_info) {
       if (display_info_.count(iter.first))
         continue;
 
@@ skipping 119 matching lines @@
   base::string16 message;
   base::string16 additional_message;
   if (GetDisplayMessageForNotification(old_info, &message, &additional_message))
     CreateOrUpdateNotification(message, additional_message);
 }
 
 bool ScreenLayoutObserver::GetExitMirrorModeMessage(
     base::string16* out_message,
     base::string16* out_additional_message) {
   switch (current_display_mode_) {
-    case DisplayMode::DOCKED:
-      // Handle disabling mirror mode as a result of going to docked mode
-      // when we only have a single display (this means we actually have two
-      // physical displays, one of which is the internal display, but they
-      // were in mirror mode, and hence considered as one. Closing the
-      // internal display disables mirror mode and we still have a single
-      // active display).
-      *out_message = GetDockedModeEnabledMessage(out_additional_message);
-      return true;
-
     case DisplayMode::EXTENDED_3_PLUS:
       // Mirror mode was turned off due to having more than two displays.
       // Show a message that mirror mode for 3+ displays is not supported.
       *out_message =
           l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_MIRRORING_NOT_SUPPORTED);
       return true;
 
+    case DisplayMode::DOCKED:
+      // Handle disabling mirror mode as a result of going to docked mode
+      // when we only have a single display (this means we actually have two
+      // physical displays, one of which is the internal display, but they
+      // were in mirror mode, and hence considered as one. Closing the
+      // internal display disables mirror mode and we still have a single
+      // active display).
+      // Falls through.
     case DisplayMode::SINGLE:
       // We're exiting mirror mode because we removed one of the two
       // displays.
       *out_message =
           l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_MIRROR_EXIT);
       return true;
 
     default:
       // Mirror mode was turned off; other messages should be shown e.g.
       // extended mode is on, ... etc.
       return false;
   }
 }
 
 }  // namespace ash