Remove ui-enable-dip option

ui/aura/root_window.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 "ui/aura/root_window.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 262 matching lines @@
   client::EventClient* client = client::GetEventClient(GetRootWindow());
   if (client && !client->CanProcessEventsWithinSubtree(focused_window_)) {
     SetFocusedWindow(NULL, NULL);
     return false;
   }
   return ProcessKeyEvent(focused_window_, &translated_event);
 }
 
 bool RootWindow::DispatchScrollEvent(ScrollEvent* event) {
   DispatchHeldMouseMove();
-  if (ui::IsDIPEnabled()) {
-    float scale = ui::GetDeviceScaleFactor(layer());
-    ui::Transform transform = layer()->transform();
-    transform.ConcatScale(scale, scale);
-    event->UpdateForRootTransform(transform);
-  } else {
-    event->UpdateForRootTransform(layer()->transform());
-  }
+  float scale = ui::GetDeviceScaleFactor(layer());
+  ui::Transform transform = layer()->transform();
+  transform.ConcatScale(scale, scale);
+  event->UpdateForRootTransform(transform);
 
   last_mouse_location_ = event->location();
   synthesize_mouse_move_ = false;
 
   Window* target =
       mouse_pressed_handler_ ? mouse_pressed_handler_ : capture_window_;
   if (!target)
     target = GetEventHandlerForPoint(event->location());
 
   if (target && target->delegate()) {
     int flags = event->flags();
     gfx::Point location_in_window = event->location();
     Window::ConvertPointToWindow(this, target, &location_in_window);
     if (IsNonClientLocation(target, location_in_window))
       flags |= ui::EF_IS_NON_CLIENT;
     ScrollEvent translated_event(*event, this, target, event->type(), flags);
     return ProcessMouseEvent(target, &translated_event);
   }
   return false;
 }
 
 bool RootWindow::DispatchTouchEvent(TouchEvent* event) {
   DispatchHeldMouseMove();
-  if (ui::IsDIPEnabled()) {
-    float scale = ui::GetDeviceScaleFactor(layer());
-    ui::Transform transform = layer()->transform();
-    transform.ConcatScale(scale, scale);
-    event->UpdateForRootTransform(transform);
-  } else {
-    event->UpdateForRootTransform(layer()->transform());
-  }
+  float scale = ui::GetDeviceScaleFactor(layer());
+  ui::Transform transform = layer()->transform();
+  transform.ConcatScale(scale, scale);
+  event->UpdateForRootTransform(transform);
   bool handled = false;
   ui::TouchStatus status = ui::TOUCH_STATUS_UNKNOWN;
   Window* target = capture_window_;
   if (!target) {
     target = ConsumerToWindow(
         gesture_recognizer_->GetTouchLockedTarget(event));
     if (!target) {
       target = ConsumerToWindow(
           gesture_recognizer_->GetTargetForLocation(event->GetLocation()));
     }
@@ skipping 595 matching lines @@
 
 Window* RootWindow::GetFocusedWindow() {
   return focused_window_;
 }
 
 bool RootWindow::IsFocusedWindow(const Window* window) const {
   return focused_window_ == window;
 }
 
 bool RootWindow::DispatchMouseEventImpl(MouseEvent* event) {
-  if (ui::IsDIPEnabled()) {
-    float scale = ui::GetDeviceScaleFactor(layer());
-    ui::Transform transform = layer()->transform();
-    transform.ConcatScale(scale, scale);
-    event->UpdateForRootTransform(transform);
-  } else {
-    event->UpdateForRootTransform(layer()->transform());
-  }
+  float scale = ui::GetDeviceScaleFactor(layer());
+  ui::Transform transform = layer()->transform();
+  transform.ConcatScale(scale, scale);
+  event->UpdateForRootTransform(transform);
   Window* target =
       mouse_pressed_handler_ ? mouse_pressed_handler_ : capture_window_;
   if (!target)
     target = GetEventHandlerForPoint(event->location());
   return DispatchMouseEventToTarget(event, target);
 }
 
 bool RootWindow::DispatchMouseEventToTarget(MouseEvent* event,
                                             Window* target) {
   static const int kMouseButtonFlagMask =
@@ skipping 74 matching lines @@
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura