Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/ash/accelerators/magnifier_key_scroller.cc

 // Copyright 2014 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/accelerators/magnifier_key_scroller.h"
 
 #include "ash/accelerators/key_hold_detector.h"
 #include "ash/ash_switches.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 
 namespace ash {
 namespace {
 bool magnifier_key_scroller_enabled = false;
 }
 
 // static
 bool MagnifierKeyScroller::IsEnabled() {
-  bool has_switch = false;
-#if defined(OS_CHROMEOS)
-  has_switch = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kAshEnableMagnifierKeyScroller);
-#endif
-
-  return (magnifier_key_scroller_enabled || has_switch) &&
+  return (magnifier_key_scroller_enabled ||
+          CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kAshEnableMagnifierKeyScroller)) &&
       ash::Shell::GetInstance()->magnification_controller()->IsEnabled();
 }
 
 // static
 void MagnifierKeyScroller::SetEnabled(bool enabled) {
   magnifier_key_scroller_enabled = enabled;
 }
 
 // static
 scoped_ptr<ui::EventHandler> MagnifierKeyScroller::CreateHandler() {
@@ skipping 39 matching lines @@
   MagnificationController* controller =
       Shell::GetInstance()->magnification_controller();
   controller->SetScrollDirection(MagnificationController::SCROLL_NONE);
 }
 
 MagnifierKeyScroller::MagnifierKeyScroller() {}
 
 MagnifierKeyScroller::~MagnifierKeyScroller() {}
 
 }  // namespace ash