Remove non ExtededDesktop mode

BUG=135245
TEST=no flags option to disable ExtendedDesktop

Review URL: https://chromiumcodereview.appspot.com/10892021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154035 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 14 deletions

diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index c398937..34b711f 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -59,24 +59,20 @@ void ScreenPositionController::ConvertPointToScreen(
     gfx::Point* point) {
   const aura::RootWindow* root = window->GetRootWindow();
   aura::Window::ConvertPointToTarget(window, root, point);
-  if (DisplayController::IsExtendedDesktopEnabled()) {
-    const gfx::Point display_origin =
-        gfx::Screen::GetDisplayNearestWindow(
-            const_cast<aura::RootWindow*>(root)).bounds().origin();
-    point->Offset(display_origin.x(), display_origin.y());
-  }
+  const gfx::Point display_origin =
+      gfx::Screen::GetDisplayNearestWindow(
+          const_cast<aura::RootWindow*>(root)).bounds().origin();
+  point->Offset(display_origin.x(), display_origin.y());
 }
 
 void ScreenPositionController::ConvertPointFromScreen(
     const aura::Window* window,
     gfx::Point* point) {
   const aura::RootWindow* root = window->GetRootWindow();
-  if (DisplayController::IsExtendedDesktopEnabled()) {
-    const gfx::Point display_origin =
-        gfx::Screen::GetDisplayNearestWindow(
-            const_cast<aura::RootWindow*>(root)).bounds().origin();
-    point->Offset(-display_origin.x(), -display_origin.y());
-  }
+  const gfx::Point display_origin =
+      gfx::Screen::GetDisplayNearestWindow(
+          const_cast<aura::RootWindow*>(root)).bounds().origin();
+  point->Offset(-display_origin.x(), -display_origin.y());
   aura::Window::ConvertPointToTarget(root, window, point);
 }
 
@@ -84,8 +80,7 @@ void ScreenPositionController::SetBounds(aura::Window* window,
                                          const gfx::Rect& bounds,
                                          const gfx::Display& display) {
   DCHECK_NE(-1, display.id());
-  if (!DisplayController::IsExtendedDesktopEnabled() ||
-      !window->parent()->GetProperty(internal::kUsesScreenCoordinatesKey)) {
+  if (!window->parent()->GetProperty(internal::kUsesScreenCoordinatesKey)) {
     window->SetBounds(bounds);
     return;
   }