Remove DisplayChangeObserver ash dependencies.

ash/display/display_change_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_change_observer_chromeos.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "ash/common/wm_shell.h"
-#include "ash/display/display_util.h"
-#include "ash/shell.h"
-#include "base/command_line.h"
 #include "base/logging.h"
-#include "grit/ash_strings.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/user_activity/user_activity_detector.h"
-#include "ui/compositor/dip_util.h"
 #include "ui/display/chromeos/touchscreen_util.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_store.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/util/display_util.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 
 namespace ash {
 
 using ui::DisplayConfigurator;
 
 namespace {
 
-// The DPI threshold to determine the device scale factor.
-// DPI higher than |dpi| will use |device_scale_factor|.
-struct DeviceScaleFactorDPIThreshold {
-  float dpi;
-  float device_scale_factor;
-};
-
-const DeviceScaleFactorDPIThreshold kThresholdTable[] = {
-    {200.0f, 2.0f},
-    {150.0f, 1.25f},
-    {0.0f, 1.0f},
-};

[oshima, 2016/11/30 18:17:09]

This is defined for readability/explanation purpose, so let's keep it.

[kylechar, 2016/11/30 21:46:03]

Done.

-
 // 1 inch in mm.
 const float kInchInMm = 25.4f;
 
 // The minimum pixel width whose monitor can be called as '4K'.
 const int kMinimumWidthFor4K = 3840;
 
 // The list of device scale factors (in addition to 1.0f) which is
-// available in extrenal large monitors.
+// available in external large monitors.
 const float kAdditionalDeviceScaleFactorsFor4k[] = {1.25f, 2.0f};
 
 void UpdateInternalDisplayId(
     const ui::DisplayConfigurator::DisplayStateList& display_states) {
   for (auto* state : display_states) {
     if (state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {
       if (display::Display::HasInternalDisplay())
         DCHECK_EQ(display::Display::InternalDisplayId(), state->display_id());
       display::Display::SetInternalDisplayId(state->display_id());
     }
@@ skipping 33 matching lines @@
     scoped_refptr<display::ManagedDisplayMode> display_mode =
         new display::ManagedDisplayMode(
             mode_info->size(), mode_info->refresh_rate(),
             mode_info->is_interlaced(), output.native_mode() == mode_info.get(),
             1.0, 1.0);
     if (display_mode->native())
       native_mode = display_mode;
 
     // Add the display mode if it isn't already present and override interlaced
     // display modes with non-interlaced ones.
-    DisplayModeMap::iterator display_mode_it = display_mode_map.find(size);
+    auto display_mode_it = display_mode_map.find(size);
     if (display_mode_it == display_mode_map.end())
       display_mode_map.insert(std::make_pair(size, display_mode));
     else if (display_mode_it->second->is_interlaced() &&
              !display_mode->is_interlaced())
       display_mode_it->second = std::move(display_mode);
   }
 
   display::ManagedDisplayInfo::ManagedDisplayModeList display_mode_list;
   for (const auto& display_mode_pair : display_mode_map)
     display_mode_list.push_back(std::move(display_mode_pair.second));
 
   if (output.native_mode()) {
     const std::pair<int, int> size(native_mode->size().width(),
                                    native_mode->size().height());
-    DisplayModeMap::iterator it = display_mode_map.find(size);
+    auto it = display_mode_map.find(size);
     DCHECK(it != display_mode_map.end())
         << "Native mode must be part of the mode list.";
 
     // If the native mode was replaced re-add it.
     if (!it->second->native())
       display_mode_list.push_back(native_mode);
   }
 
   if (native_mode->size().width() >= kMinimumWidthFor4K) {
     for (size_t i = 0; i < arraysize(kAdditionalDeviceScaleFactorsFor4k); ++i) {
       scoped_refptr<display::ManagedDisplayMode> mode =
           new display::ManagedDisplayMode(
               native_mode->size(), native_mode->refresh_rate(),
               native_mode->is_interlaced(), false /* native */,
               native_mode->ui_scale(), kAdditionalDeviceScaleFactorsFor4k[i]);
       display_mode_list.push_back(mode);
     }
   }
 
   return display_mode_list;
 }
 
-DisplayChangeObserver::DisplayChangeObserver() {
-  WmShell::Get()->AddShellObserver(this);
+DisplayChangeObserver::DisplayChangeObserver(
+    std::unique_ptr<display::DisplayStringProvider> string_provider)
+    : string_provider_(std::move(string_provider)) {
   ui::InputDeviceManager::GetInstance()->AddObserver(this);
 }
 
 DisplayChangeObserver::~DisplayChangeObserver() {
   ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
-  WmShell::Get()->RemoveShellObserver(this);
 }
 
 ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
     const ui::DisplayConfigurator::DisplayStateList& display_states) const {
   UpdateInternalDisplayId(display_states);
   if (display_states.size() == 1)
     return ui::MULTIPLE_DISPLAY_STATE_SINGLE;
   display::DisplayIdList list = display::GenerateDisplayIdList(
       display_states.begin(), display_states.end(),
       [](const ui::DisplaySnapshot* display_state) {
         return display_state->display_id();
       });
 
-  const display::DisplayLayout& layout = Shell::GetInstance()
-                                             ->display_manager()
-                                             ->layout_store()
-                                             ->GetRegisteredDisplayLayout(list);
+  const display::DisplayLayout& layout =
+      display_manager_->layout_store()->GetRegisteredDisplayLayout(list);
   return layout.mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR
                          : ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
 }
 
 bool DisplayChangeObserver::GetResolutionForDisplayId(int64_t display_id,
                                                       gfx::Size* size) const {
   scoped_refptr<display::ManagedDisplayMode> mode =
-      Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
-          display_id);
+      display_manager_->GetSelectedModeForDisplayId(display_id);
   if (!mode)
     return false;
   *size = mode->size();
   return true;
 }
 
 void DisplayChangeObserver::OnDisplayModeChanged(
     const ui::DisplayConfigurator::DisplayStateList& display_states) {
   UpdateInternalDisplayId(display_states);
 
   std::vector<display::ManagedDisplayInfo> displays;
   std::set<int64_t> ids;
   for (const ui::DisplaySnapshot* state : display_states) {
     const ui::DisplayMode* mode_info = state->current_mode();
     if (!mode_info)
       continue;
 
     float device_scale_factor = 1.0f;
     // Sets dpi only if the screen size is not blacklisted.
     float dpi = display::IsDisplaySizeBlackListed(state->physical_size())
                     ? 0
                     : kInchInMm * mode_info->size().width() /
                           state->physical_size().width();
     if (state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {
       if (dpi)
         device_scale_factor = FindDeviceScaleFactor(dpi);
     } else {
       scoped_refptr<display::ManagedDisplayMode> mode =
-          Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
-              state->display_id());
+          display_manager_->GetSelectedModeForDisplayId(state->display_id());
       if (mode) {
         device_scale_factor = mode->device_scale_factor();
       } else {
         // For monitors that are 40 inches and 4K or above, set
         // |device_scale_factor| to 2x. For margin purposes, 100 is subtracted
         // from the value of |k2xThreshouldSizeSquaredFor4KInMm|
         const int k2xThreshouldSizeSquaredFor4KInMm =
             (40 * 40 * kInchInMm * kInchInMm) - 100;
         gfx::Vector2d size_in_vec(state->physical_size().width(),
                                   state->physical_size().height());
         if (size_in_vec.LengthSquared() > k2xThreshouldSizeSquaredFor4KInMm &&
             mode_info->size().width() >= kMinimumWidthFor4K) {
           // Make sure that additional device scale factors table has 2x.
           DCHECK_EQ(2.0f, kAdditionalDeviceScaleFactorsFor4k[1]);
           device_scale_factor = 2.0f;
         }
       }
     }
     gfx::Rect display_bounds(state->origin(), mode_info->size());
 
     std::string name;
     switch (state->type()) {
       case ui::DISPLAY_CONNECTION_TYPE_INTERNAL:
-        name = l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME);
+        name = string_provider_->GetInternalDisplayNameString();
         break;
       case ui::DISPLAY_CONNECTION_TYPE_VIRTUAL:
-        name = l10n_util::GetStringUTF8(IDS_ASH_VIRTUAL_DISPLAY_NAME);
+        name = string_provider_->GetVirtualDisplayNameString();
         break;
       default:
         name = state->display_name();
     }
 
     if (name.empty())
-      name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
+      name = string_provider_->GetUnknownDisplayNameString();
 
     bool has_overscan = state->has_overscan();
     int64_t id = state->display_id();
     ids.insert(id);
 
     displays.push_back(display::ManagedDisplayInfo(id, name, has_overscan));
     display::ManagedDisplayInfo& new_info = displays.back();
     new_info.set_sys_path(state->sys_path());
     new_info.set_device_scale_factor(device_scale_factor);
     new_info.SetBounds(display_bounds);
     new_info.set_native(true);
     new_info.set_is_aspect_preserving_scaling(
         state->is_aspect_preserving_scaling());
     if (dpi)
       new_info.set_device_dpi(dpi);
 
     display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
         (state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL)
             ? GetInternalManagedDisplayModeList(new_info, *state)
             : GetExternalManagedDisplayModeList(*state);
     new_info.SetManagedDisplayModes(display_modes);
 
     new_info.set_available_color_profiles(
-        Shell::GetInstance()
-            ->display_configurator()
-            ->GetAvailableColorCalibrationProfiles(id));
+        display_configurator_->GetAvailableColorCalibrationProfiles(id));
     new_info.set_maximum_cursor_size(state->maximum_cursor_size());
   }
 
   display::AssociateTouchscreens(
       &displays,
       ui::InputDeviceManager::GetInstance()->GetTouchscreenDevices());
-  // DisplayManager can be null during the boot.
-  Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
+  display_manager_->OnNativeDisplaysChanged(displays);
 
   // For the purposes of user activity detection, ignore synthetic mouse events
   // that are triggered by screen resizes: http://crbug.com/360634
   ui::UserActivityDetector* user_activity_detector =
       ui::UserActivityDetector::Get();
   if (user_activity_detector)
     user_activity_detector->OnDisplayPowerChanging();
 }
 
 void DisplayChangeObserver::OnDisplayModeChangeFailed(
     const ui::DisplayConfigurator::DisplayStateList& displays,
     ui::MultipleDisplayState failed_new_state) {
   // If display configuration failed during startup, simply update the display
   // manager with detected displays. If no display is detected, it will
   // create a pseudo display.
-  if (Shell::GetInstance()->display_manager()->GetNumDisplays() == 0)
+  if (display_manager_->GetNumDisplays() == 0)
     OnDisplayModeChanged(displays);
 }
 
-void DisplayChangeObserver::OnAppTerminating() {
-  // Stop handling display configuration events once the shutdown
-  // process starts. crbug.com/177014.
-  Shell::GetInstance()->display_configurator()->PrepareForExit();
+void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() {
+  OnDisplayModeChanged(display_configurator_->cached_displays());
 }
 
 // static
 float DisplayChangeObserver::FindDeviceScaleFactor(float dpi) {
-  for (size_t i = 0; i < arraysize(kThresholdTable); ++i) {
-    if (dpi > kThresholdTable[i].dpi)
-      return kThresholdTable[i].device_scale_factor;
-  }
-  return 1.0f;
-}
-
-void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() {
-  OnDisplayModeChanged(
-      Shell::GetInstance()->display_configurator()->cached_displays());
+  if (dpi > 200.0f)
+    return 2.0f;
+  else if (dpi > 150.0f)
+    return 1.25f;
+  else
+    return 1.0f;
 }
 
 }  // namespace ash