Move ash::DisplayManager switches to ui::display

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 "ash/common/ash_switches.h"
+//

[oshima, 2016/09/06 20:09:47]

nit: remove this

[rjkroege, 2016/09/07 23:12:00]

Done.

 #include "ash/display/display_util.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/auto_reset.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"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"  // nogncheck
@@ skipping 51 matching lines @@
           info->bounds_in_native().size(), 0.0 /* refresh_rate */,
           false /* interlaced */, false /* native_mode */, 1.0 /* ui_scale */,
           info->device_scale_factor());
   info->SetManagedDisplayModes(
       display::CreateInternalManagedDisplayModeList(native_mode));
 }
 
 void MaybeInitInternalDisplay(display::ManagedDisplayInfo* info) {
   int64_t id = info->id();
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kAshUseFirstDisplayAsInternal)) {
+  if (command_line->HasSwitch(::switches::kUseFirstDisplayAsInternal)) {
     display::Display::SetInternalDisplayId(id);
     SetInternalManagedDisplayModeList(info);
   }
 }
 
 gfx::Size GetMaxNativeSize(const display::ManagedDisplayInfo& info) {
   gfx::Size size;
   for (auto& mode : info.display_modes()) {
     if (mode->size().GetArea() > size.GetArea())
       size = mode->size();
@@ skipping 20 matching lines @@
       multi_display_mode_(EXTENDED),
       current_default_multi_display_mode_(EXTENDED),
       mirroring_display_id_(display::Display::kInvalidDisplayID),
       registered_internal_display_rotation_lock_(false),
       registered_internal_display_rotation_(display::Display::ROTATE_0),
       unified_desktop_enabled_(false),
       weak_ptr_factory_(this) {
 #if defined(OS_CHROMEOS)
   change_display_upon_host_resize_ = !base::SysInfo::IsRunningOnChromeOS();
   unified_desktop_enabled_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kAshEnableUnifiedDesktop);
+      ::switches::kEnableUnifiedDesktop);
 #endif
 }
 
 DisplayManager::~DisplayManager() {
 #if defined(OS_CHROMEOS)
   // Reset the font params.
   gfx::SetFontRenderParamsDeviceScaleFactor(1.0f);
 #endif
 }
 
 bool DisplayManager::InitFromCommandLine() {
   DisplayInfoList info_list;
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kAshHostWindowBounds))
+  if (!command_line->HasSwitch(::switches::kHostWindowBounds))
     return false;
   const string size_str =
-      command_line->GetSwitchValueASCII(switches::kAshHostWindowBounds);
+      command_line->GetSwitchValueASCII(::switches::kHostWindowBounds);
   for (const std::string& part : base::SplitString(
            size_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
     info_list.push_back(display::ManagedDisplayInfo::CreateFromSpec(part));
     info_list.back().set_native(true);
   }
   MaybeInitInternalDisplay(&info_list[0]);
   if (info_list.size() > 1 &&
-      command_line->HasSwitch(switches::kAshEnableSoftwareMirroring)) {
+      command_line->HasSwitch(::switches::kEnableSoftwareMirroring)) {
     SetMultiDisplayMode(MIRRORING);
   }
   OnNativeDisplaysChanged(info_list);
   return true;
 }
 
 void DisplayManager::InitDefaultDisplay() {
   DisplayInfoList info_list;
   info_list.push_back(
       display::ManagedDisplayInfo::CreateFromSpec(std::string()));
@@ skipping 1218 matching lines @@
 
 void DisplayManager::AddObserver(display::DisplayObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DisplayManager::RemoveObserver(display::DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ash