Remove ash localization from display_manager.cc

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 <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "grit/ash_strings.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/display_observer.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/manager/display_layout_store.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/font_render_params.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
@@ skipping 564 matching lines @@
     else if (display_modes_.find(iter->id()) != display_modes_.end())
       display_modes_[iter->id()] = *display_modes_iter;
   }
   if (display::Display::HasInternalDisplay() && !internal_display_connected) {
     if (display_info_.find(display::Display::InternalDisplayId()) ==
         display_info_.end()) {
       // Create a dummy internal display if the chrome restarted
       // in docked mode.
       display::ManagedDisplayInfo internal_display_info(
           display::Display::InternalDisplayId(),
-          l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME),
+          // l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME),

[oshima, 2016/09/30 23:03:40]

remove this

[rjkroege, 2016/10/05 00:40:27]

Done.

+          delegate_->GetInternalDisplayNameString(),
           false /*Internal display must not have overscan */);
       internal_display_info.SetBounds(gfx::Rect(0, 0, 800, 600));
       display_info_[display::Display::InternalDisplayId()] =
           internal_display_info;
     } else {
       // Internal display is no longer active. Reset its rotation to user
       // preference, so that it is restored when the internal display becomes
       // active again.
       display::Display::Rotation user_rotation =
           display_info_[display::Display::InternalDisplayId()].GetRotation(
@@ skipping 298 matching lines @@
                            software_mirroring_display_list_.end(),
                            [display_id](const display::Display& display) {
                              return display.id() == display_id;
                            });
   return iter == software_mirroring_display_list_.end() ? display::Display()
                                                         : *iter;
 }
 
 std::string DisplayManager::GetDisplayNameForId(int64_t id) {
   if (id == display::Display::kInvalidDisplayID)
-    return l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
+    return delegate_->GetInternalDisplayNameString();
 
   std::map<int64_t, display::ManagedDisplayInfo>::const_iterator iter =
       display_info_.find(id);
   if (iter != display_info_.end() && !iter->second.name().empty())
     return iter->second.name();
 
   return base::StringPrintf("Display %d", static_cast<int>(id));
 }
 
 int64_t DisplayManager::GetDisplayIdForUIScaling() const {
@@ skipping 491 matching lines @@
 
 const display::Display& DisplayManager::GetSecondaryDisplay() const {
   CHECK_LE(2U, GetNumDisplays());
   return GetDisplayAt(0).id() ==
                  display::Screen::GetScreen()->GetPrimaryDisplay().id()
              ? GetDisplayAt(1)
              : GetDisplayAt(0);
 }
 
 }  // namespace ash