Revert 140031 - Chrome version of monitor configuration code

New MonitorConfigurator class interprets events (ctrl-F4, display add/remove, and brightness-related CRTC state changes).

Ctrl-F4 events come in through the AcceleratorController.
Display add/remove events are interpretted by MonitorChangeObserverX11.
CRTC enable/disable events related to power management come over DBus and are interpretted by the new OutputObserver class.

BUG=chromium:126493
TEST=Manually tested with an additional display and mode switching on Lumpy.


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

TBR=disher@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10459076

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

1 files changed, 0 insertions, 14 deletions

diff --git a/ash/shell.h b/ash/shell.h
index 6e874c0..0e64b71 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -36,9 +36,6 @@ class InputMethodEventFilter;
 class RootWindowEventFilter;
 }
 }
-namespace chromeos {
-class OutputConfigurator;
-}
 namespace content {
 class BrowserContext;
 }
@@ -320,12 +317,6 @@ class ASH_EXPORT Shell {
   // Initialize the root window to be used for a secondary monitor.
   void InitRootWindowForSecondaryMonitor(aura::RootWindow* root);
 
-#if defined(OS_CHROMEOS)
-  chromeos::OutputConfigurator* output_configurator() {
-    return output_configurator_.get();
-  }
-#endif  // defined(OS_CHROMEOS)
-
  private:
   FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, TransformActivate);
@@ -422,11 +413,6 @@ class ASH_EXPORT Shell {
   // of layer animations for visual debugging.
   scoped_ptr<internal::SlowAnimationEventFilter> slow_animation_filter_;
 
-#if defined(OS_CHROMEOS)
-  // Controls video output device state.
-  scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
-#endif  // defined(OS_CHROMEOS)
-
   // The shelf for managing the launcher and the status widget in non-compact
   // mode. Shell does not own the shelf. Instead, it is owned by container of
   // the status area.