Chromium Code Reviews| Index: ash/display/display_controller.cc |
| diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc |
| index d2e0ee59d3487b466ffe90e1d30289c613c47032..b3f1407c229ccc543444e8a34e2b9c006b59dfcd 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,7 +260,7 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay( |
| } |
| void DisplayController::UpdateDisplayBoundsForLayout() { |
| - if (!IsVirtualScreenCoordinatesEnabled() || |
| + if (!IsExtendedDesktopEnabled() || |
| gfx::Screen::GetNumDisplays() <= 1) { |
|
Daniel Erat
2012/07/23 20:47:57
nit: you should be able to fit this on a single li
oshima
2012/07/23 21:15:39
Done.
|
| return; |
| } |