| Index: ash/display/display_controller.cc
|
| diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
|
| index d2e0ee59d3487b466ffe90e1d30289c613c47032..b9c2d3a8f99d913bf8f5a838ecff560d707b989e 100644
|
| --- a/ash/display/display_controller.cc
|
| +++ b/ash/display/display_controller.cc
|
| @@ -22,10 +22,7 @@ namespace internal {
|
| namespace {
|
| // True if the extended desktop mode is enabled.
|
| bool extended_desktop_enabled = false;
|
| -
|
| -// True if the virtual screen coordinates is enabled.
|
| -bool virtual_screen_coordinates_enabled = false;
|
| -}
|
| +} // namespace
|
|
|
| DisplayController::DisplayController()
|
| : secondary_display_layout_(RIGHT) {
|
| @@ -245,19 +242,6 @@ void DisplayController::SetExtendedDesktopEnabled(bool enabled) {
|
| extended_desktop_enabled = enabled;
|
| }
|
|
|
| -// static
|
| -bool DisplayController::IsVirtualScreenCoordinatesEnabled() {
|
| - return IsExtendedDesktopEnabled() &&
|
| - (virtual_screen_coordinates_enabled ||
|
| - CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kAshVirtualScreenCoordinates));
|
| -}
|
| -
|
| -// static
|
| -void DisplayController::SetVirtualScreenCoordinatesEnabled(bool enabled) {
|
| - virtual_screen_coordinates_enabled = enabled;
|
| -}
|
| -
|
| aura::RootWindow* DisplayController::AddRootWindowForDisplay(
|
| const gfx::Display& display) {
|
| aura::RootWindow* root = aura::Env::GetInstance()->display_manager()->
|
| @@ -276,8 +260,7 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay(
|
| }
|
|
|
| void DisplayController::UpdateDisplayBoundsForLayout() {
|
| - if (!IsVirtualScreenCoordinatesEnabled() ||
|
| - gfx::Screen::GetNumDisplays() <= 1) {
|
| + if (!IsExtendedDesktopEnabled() || gfx::Screen::GetNumDisplays() <= 1) {
|
| return;
|
| }
|
| DCHECK_EQ(2, gfx::Screen::GetNumDisplays());
|
|
|