Relocate reuseable portions of ash/display/display_util.*

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/ash_switches.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
 #include "ash/touch/touchscreen_util.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/display.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_store.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;
 
@@ skipping 40 matching lines @@
 DisplayChangeObserver::GetInternalManagedDisplayModeList(
     const display::ManagedDisplayInfo& display_info,
     const ui::DisplaySnapshot& output) {
   const ui::DisplayMode* ui_native_mode = output.native_mode();
   scoped_refptr<display::ManagedDisplayMode> native_mode =
       new display::ManagedDisplayMode(ui_native_mode->size(),
                                       ui_native_mode->refresh_rate(),
                                       ui_native_mode->is_interlaced(), true,
                                       1.0, display_info.device_scale_factor());
 
-  return CreateInternalManagedDisplayModeList(native_mode);
+  return display::CreateInternalManagedDisplayModeList(native_mode);
 }
 
 // static
 display::ManagedDisplayInfo::ManagedDisplayModeList
 DisplayChangeObserver::GetExternalManagedDisplayModeList(
     const ui::DisplaySnapshot& output) {
   using DisplayModeMap =
       std::map<std::pair<int, int>, scoped_refptr<display::ManagedDisplayMode>>;
   DisplayModeMap display_mode_map;
 
@@ skipping 58 matching lines @@
 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 =
-      GenerateDisplayIdList(display_states.begin(), display_states.end(),
-                            [](const ui::DisplaySnapshot* display_state) {
-                              return display_state->display_id();
-                            });
+  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);
   return layout.mirrored ? ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR
                          : ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED;
 }
 
 bool DisplayChangeObserver::GetResolutionForDisplayId(int64_t display_id,
@@ skipping 132 matching lines @@
   }
   return 1.0f;
 }
 
 void DisplayChangeObserver::OnTouchscreenDeviceConfigurationChanged() {
   OnDisplayModeChanged(
       Shell::GetInstance()->display_configurator()->cached_displays());
 }
 
 }  // namespace ash