Revert "Caches the display names in MultiDisplayManager."

ash/display/multi_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/multi_display_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window_property.h"
-#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size_conversions.h"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 241 matching lines @@
 
   // Do not update |displays_| if there's nothing to be updated. Without this,
   // it will not update the display layout, which causes the bug
   // http://crbug.com/155948.
   if (changed_display_indices.empty() && added_display_indices.empty() &&
       removed_displays.empty()) {
     return;
   }
 
   displays_ = new_displays;
-  RefreshDisplayNames();
-
   // Temporarily add displays to be removed because display object
   // being removed are accessed during shutting down the root.
   displays_.insert(displays_.end(), removed_displays.begin(),
                    removed_displays.end());
   for (std::vector<size_t>::iterator iter = changed_display_indices.begin();
        iter != changed_display_indices.end(); ++iter) {
     NotifyBoundsChanged(displays_[*iter]);
   }
   for (std::vector<size_t>::iterator iter = added_display_indices.begin();
        iter != added_display_indices.end(); ++iter) {
@@ skipping 70 matching lines @@
       max = area;
       matching = &(*iter);
     }
   }
   // Fallback to the primary display if there is no matching display.
   return matching ? *matching : DisplayController::GetPrimaryDisplay();
 }
 
 std::string MultiDisplayManager::GetDisplayNameFor(
     const gfx::Display& display) {
-  if (!display.is_valid())
-    return l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
+  if (HasInternalDisplay() && IsInternalDisplayId(display.id())) {
+    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+    return UTF16ToUTF8(
+        bundle.GetLocalizedString(IDS_ASH_INTERNAL_DISPLAY_NAME));
+  }
 
-  std::map<int64, std::string>::const_iterator iter =
-      display_names_.find(display.id());
-  if (iter != display_names_.end())
-    return iter->second;
-
+#if defined(USE_X11)
+  std::vector<XID> outputs;
+  if (display.id() != gfx::Display::kInvalidDisplayID &&
+      ui::GetOutputDeviceHandles(&outputs)) {
+    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) &&
+          display.id() ==
+          gfx::Display::GetID(manufacturer_id, serial_number)) {
+        return name;
+      }
+    }
+  }
+#endif
   return base::StringPrintf("Display %d", static_cast<int>(display.id()));
 }
 
 void MultiDisplayManager::OnRootWindowResized(const aura::RootWindow* root,
                                               const gfx::Size& old_size) {
   if (!use_fullscreen_host_window()) {
     gfx::Display& display = FindDisplayForRootWindow(root);
     if (display.size() != root->GetHostSize()) {
       display.SetSize(root->GetHostSize());
       NotifyBoundsChanged(display);
@@ skipping 10 matching lines @@
     for (size_t i = 0; i < output_names.size(); ++i) {
       if (chromeos::OutputConfigurator::IsInternalOutputName(
               output_names[i])) {
         internal_display_id_ = GetDisplayIdForOutput(outputs[i]);
         break;
       }
     }
   }
 #endif
 
-  RefreshDisplayNames();
-
 #if defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_WIN8)
     set_use_fullscreen_host_window(true);
 #endif
   // TODO(oshima): Move this logic to DisplayChangeObserver.
   const string size_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       switches::kAuraHostWindowSize);
   vector<string> parts;
   base::SplitString(size_str, ',', &parts);
   for (vector<string>::const_iterator iter = parts.begin();
@@ skipping 97 matching lines @@
   }
 
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   aura::client::ScreenPositionClient* client =
       aura::client::GetScreenPositionClient(root_window);
   client->ConvertPointFromScreen(root_window, &target_location);
 
   root_window->MoveCursorTo(target_location);
 }
 
-void MultiDisplayManager::RefreshDisplayNames() {
-  display_names_.clear();
-
-  if (!base::chromeos::IsRunningOnChromeOS())
-    return;
-
-#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_names_[id] =
-            l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME);
-      } else {
-        display_names_[id] = name;
-      }
-    }
-  }
-#endif
-}
-
 void MultiDisplayManager::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