Relocate display_manager from ash to ui

chrome/browser/ui/webui/options/chromeos/display_options_handler.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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "ash/common/strings/grit/ash_strings.h"
 #include "ash/display/display_configuration_controller.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_builder.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace chromeos {
 namespace options {
 namespace {
 
-ash::DisplayManager* GetDisplayManager() {
+display::DisplayManager* GetDisplayManager() {
   return ash::Shell::GetInstance()->display_manager();
 }
 
 ash::DisplayConfigurationController* GetDisplayConfigurationController() {
   return ash::Shell::GetInstance()->display_configuration_controller();
 }
 
 int64_t GetDisplayIdFromValue(const base::Value* arg) {
   std::string id_value;
   if (!arg->GetAsString(&id_value))
@@ skipping 242 matching lines @@
 
 void DisplayOptionsHandler::OnDisplayConfigurationChanging() {
 }
 
 void DisplayOptionsHandler::OnDisplayConfigurationChanged() {
   UpdateDisplaySettingsEnabled();
   SendAllDisplayInfo();
 }
 
 void DisplayOptionsHandler::SendAllDisplayInfo() {
-  ash::DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
 
   std::vector<display::Display> displays;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i)
     displays.push_back(display_manager->GetDisplayAt(i));
 
-  ash::DisplayManager::MultiDisplayMode display_mode;
+  display::DisplayManager::MultiDisplayMode display_mode;
   if (display_manager->IsInMirrorMode())
-    display_mode = ash::DisplayManager::MIRRORING;
+    display_mode = display::DisplayManager::MIRRORING;
   else if (display_manager->IsInUnifiedMode())
-    display_mode = ash::DisplayManager::UNIFIED;
+    display_mode = display::DisplayManager::UNIFIED;
   else
-    display_mode = ash::DisplayManager::EXTENDED;
+    display_mode = display::DisplayManager::EXTENDED;
   base::FundamentalValue mode(static_cast<int>(display_mode));
 
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   std::unique_ptr<base::ListValue> js_displays(new base::ListValue);
   for (const display::Display& display : displays) {
     const display::ManagedDisplayInfo& display_info =
         display_manager->GetDisplayInfo(display.id());
     auto js_display = base::MakeUnique<base::DictionaryValue>();
     js_display->SetString("id", base::Int64ToString(display.id()));
     js_display->SetString("name",
@@ skipping 43 matching lines @@
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.DisplayOptions.setDisplayInfo", mode, *js_displays);
 }
 
 void DisplayOptionsHandler::UpdateDisplaySettingsEnabled() {
   // TODO(mash) Support Chrome display settings in Mash. crbug.com/548429
   if (chrome::IsRunningInMash())
     return;
 
-  ash::DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   bool disable_multi_display_layout =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableMultiDisplayLayout);
   bool ui_enabled = display_manager->num_connected_displays() <= 2 ||
                     !disable_multi_display_layout;
   bool unified_enabled = display_manager->unified_desktop_enabled();
   bool mirrored_enabled = display_manager->num_connected_displays() == 2;
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.BrowserOptions.enableDisplaySettings",
@@ skipping 29 matching lines @@
       display_id, true /* user_action */);
 }
 
 void DisplayOptionsHandler::HandleSetDisplayLayout(
     const base::ListValue* args) {
   const base::ListValue* layouts = nullptr;
   if (!args->GetList(0, &layouts))
     NOTREACHED();
   content::RecordAction(base::UserMetricsAction("Options_DisplayRearrange"));
 
-  ash::DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   display::DisplayLayoutBuilder builder(
       display_manager->GetCurrentDisplayLayout());
   builder.ClearPlacements();
   for (const auto& layout : *layouts) {
     const base::DictionaryValue* dictionary;
     if (!layout->GetAsDictionary(&dictionary)) {
       LOG(ERROR) << "Invalid layout dictionary: " << *dictionary;
       continue;
     }
 
@@ skipping 41 matching lines @@
     return;
   }
 
   scoped_refptr<display::ManagedDisplayMode> mode =
       ConvertValueToManagedDisplayMode(mode_data);
   if (!mode)
     return;
 
   content::RecordAction(
       base::UserMetricsAction("Options_DisplaySetResolution"));
-  ash::DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   scoped_refptr<display::ManagedDisplayMode> current_mode =
       display_manager->GetActiveModeForDisplayId(display_id);
   if (!display_manager->SetDisplayMode(display_id, mode)) {
     LOG(ERROR) << "Unable to set display mode for: " << display_id
                << " Mode: " << *mode_data;
     return;
   }
   if (display::Display::IsInternalDisplayId(display_id))
     return;
   // For external displays, show a notification confirming the resolution
@@ skipping 66 matching lines @@
 }
 
 void DisplayOptionsHandler::HandleSetUnifiedDesktopEnabled(
     const base::ListValue* args) {
   DCHECK(GetDisplayManager()->unified_desktop_enabled());
   bool enable = false;
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
-      enable ? ash::DisplayManager::UNIFIED : ash::DisplayManager::EXTENDED);
+      enable ? display::DisplayManager::UNIFIED
+             : display::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos