Remove USE_X11==1 check when including OutputConfigurator

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 483 matching lines @@
 
   // Made available for tests.
   ::wm::ShadowController* shadow_controller() {
     return shadow_controller_.get();
   }
 
   // Starts the animation that occurs on first login.
   void DoInitialWorkspaceAnimation();
 
 #if defined(OS_CHROMEOS)
-#if defined(USE_X11)
   // TODO(oshima): Move these objects to DisplayController.
   ui::OutputConfigurator* output_configurator() {
     return output_configurator_.get();
   }
   internal::OutputConfiguratorAnimation* output_configurator_animation() {
     return output_configurator_animation_.get();
   }
   internal::DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
-#endif  // defined(USE_X11)
 
   internal::ResolutionNotificationController*
       resolution_notification_controller() {
     return resolution_notification_controller_.get();
   }
 
   internal::LogoutConfirmationController* logout_confirmation_controller() {
     return logout_confirmation_controller_.get();
   }
 #endif  // defined(OS_CHROMEOS)
@@ skipping 179 matching lines @@
   scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_;
   scoped_ptr<StickyKeysController> sticky_keys_controller_;
   scoped_ptr<internal::ResolutionNotificationController>
       resolution_notification_controller_;
   scoped_ptr<internal::BluetoothNotificationController>
       bluetooth_notification_controller_;
   scoped_ptr<internal::LogoutConfirmationController>
       logout_confirmation_controller_;
   scoped_ptr<internal::LastWindowClosedLogoutReminder>
       last_window_closed_logout_reminder_;
-#if defined(USE_X11)
   // Controls video output device state.
   scoped_ptr<ui::OutputConfigurator> output_configurator_;
   scoped_ptr<internal::OutputConfiguratorAnimation>
       output_configurator_animation_;
   scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
   scoped_ptr<internal::ProjectingObserver> projecting_observer_;
 
   // Listens for output changes and updates the display manager.
   scoped_ptr<internal::DisplayChangeObserver> display_change_observer_;
 
+#if defined(USE_X11)
   scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
   scoped_ptr<ui::EventHandler> speech_feedback_handler_;
 #endif  // defined(USE_X11)
 #endif  // defined(OS_CHROMEOS)
 
   // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
   // pointer to vend to test code.
   AshNativeCursorManager* native_cursor_manager_;
   ::wm::CursorManager cursor_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   bool is_touch_hud_projection_enabled_;
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_