Fixes wrong logic for display names.

ash/display/display_manager.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/display/display_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/display/display_controller.h"
@@ skipping 372 matching lines @@
   return matching ? *matching : DisplayController::GetPrimaryDisplay();
 }
 
 std::string DisplayManager::GetDisplayNameFor(
     const gfx::Display& display) {
   if (!display.is_valid())
     return l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
 
   std::map<int64, DisplayInfo>::const_iterator iter =
       display_info_.find(display.id());
-  if (iter != display_info_.end())
+  if (iter != display_info_.end() && !iter->second.name.empty())
     return iter->second.name;
 
   return base::StringPrintf("Display %d", static_cast<int>(display.id()));
 }
 
 void DisplayManager::OnRootWindowResized(const aura::RootWindow* root,
                                          const gfx::Size& old_size) {
   if (!aura::UseFullscreenHostWindow()) {
     gfx::Display& display = FindDisplayForRootWindow(root);
     if (display.size() != root->GetHostSize()) {
@@ skipping 147 matching lines @@
 
 #if defined(USE_X11)
   std::vector<XID> outputs;
   if (!ui::GetOutputDeviceHandles(&outputs))
     return;
 
   for (size_t i = 0; i < outputs.size(); ++i) {
     uint16 manufacturer_id = 0;
     uint32 serial_number = 0;
     std::string name;
-    if (ui::GetOutputDeviceData(
-            outputs[i], &manufacturer_id, &serial_number, &name)) {
-      int64 id = gfx::Display::GetID(manufacturer_id, serial_number);
-      if (IsInternalDisplayId(id)) {
-        display_info_[id].name =
-            l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME);
-      } else {
-        display_info_[id].name = name;
-      }
+    ui::GetOutputDeviceData(
+        outputs[i], &manufacturer_id, &serial_number, &name);
+    int64 id = gfx::Display::GetID(manufacturer_id, serial_number);
+    if (IsInternalDisplayId(id)) {
+      display_info_[id].name =
+          l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME);
+    } else if (!name.empty()) {
+      display_info_[id].name = name;
     }
   }
 #endif
 }
 
 void DisplayManager::SetDisplayIdsForTest(DisplayList* to_update) const {
   DisplayList::iterator iter_to_update = to_update->begin();
   DisplayList::const_iterator iter = displays_.begin();
   for (; iter != displays_.end() && iter_to_update != to_update->end();
        ++iter, ++iter_to_update) {
     (*iter_to_update).set_id((*iter).id());
   }
 }
 
 }  // namespace internal
 }  // namespace ash