summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorsteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-22 09:49:06 +0000
committersteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-22 09:49:06 +0000
commit2a26caf6f9b233925a746c0adfc96c9f1c06fe3d (patch)
tree5c4a28df8a665c8102d91f26968a3d9ac92a6a0f /ash
parentbeb38e49fed94ca2e496658ff75152a7ced7a5da (diff)
downloadchromium_src-2a26caf6f9b233925a746c0adfc96c9f1c06fe3d.zip
chromium_src-2a26caf6f9b233925a746c0adfc96c9f1c06fe3d.tar.gz
chromium_src-2a26caf6f9b233925a746c0adfc96c9f1c06fe3d.tar.bz2
Revert 138212 - Implement High Contrast mode for Chrome OS.
-Add controller to ash for managing the state of High Contrast mode -Add API to shell to allow Chromium to turn the mode on and off -Add the option to the Chromium OS accessibility settings page. -Add functions to layer.cc/h to enable an inversion filter. This change breaks the build on the Windows canaries after WebKit r117864 due to a change in the the Chromium WebFilterOperation API. See http://build.chromium.org/p/chromium.webkit/builders/Win%20Builder/builds/22082 and https://bugs.webkit.org/show_bug.cgi?id=87046. BUG=chromium-os:30678 Review URL: https://chromiumcodereview.appspot.com/10201014 TBR=zork@chromium.org Review URL: https://chromiumcodereview.appspot.com/10407089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/ash.gyp2
-rw-r--r--ash/high_contrast/high_contrast_controller.cc24
-rw-r--r--ash/high_contrast/high_contrast_controller.h36
-rw-r--r--ash/shell.cc2
-rw-r--r--ash/shell.h7
5 files changed, 0 insertions, 71 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 601b329..856001f 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -67,8 +67,6 @@
'drag_drop/drag_image_view.h',
'focus_cycler.cc',
'focus_cycler.h',
- 'high_contrast/high_contrast_controller.cc',
- 'high_contrast/high_contrast_controller.h',
'key_rewriter_delegate.h',
'launcher/background_animator.cc',
'launcher/background_animator.h',
diff --git a/ash/high_contrast/high_contrast_controller.cc b/ash/high_contrast/high_contrast_controller.cc
deleted file mode 100644
index b501fc9..0000000
--- a/ash/high_contrast/high_contrast_controller.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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 "ash/high_contrast/high_contrast_controller.h"
-
-#include "ash/shell.h"
-#include "ui/aura/root_window.h"
-#include "ui/compositor/layer.h"
-
-namespace ash {
-
-HighContrastController::HighContrastController()
- : enabled_(false) {
- root_window_ = ash::Shell::GetRootWindow();
-}
-
-void HighContrastController::SetEnabled(bool enabled) {
- enabled_ = enabled;
-
- root_window_->layer()->SetInverted(enabled_);
-}
-
-} // namespace ash
diff --git a/ash/high_contrast/high_contrast_controller.h b/ash/high_contrast/high_contrast_controller.h
deleted file mode 100644
index b5b589f..0000000
--- a/ash/high_contrast/high_contrast_controller.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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_HIGH_CONTRAST_HIGH_CONTRAST_CONTROLLER_H_
-#define ASH_HIGH_CONTRAST_HIGH_CONTRAST_CONTROLLER_H_
-#pragma once
-
-#include "ash/ash_export.h"
-#include "base/basictypes.h"
-
-namespace aura {
-class RootWindow;
-}
-
-namespace ash {
-
-class ASH_EXPORT HighContrastController {
- public:
- HighContrastController();
-
- ~HighContrastController() {}
-
- void SetEnabled(bool enabled);
-
- private:
- aura::RootWindow* root_window_;
-
- bool enabled_;
-
- DISALLOW_COPY_AND_ASSIGN(HighContrastController);
-};
-
-} // namespace ash
-
-#endif // ASH_HIGH_CONTRAST_HIGH_CONTRAST_CONTROLLER_H_
diff --git a/ash/shell.cc b/ash/shell.cc
index 4ad7769..4731c74 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -14,7 +14,6 @@
#include "ash/desktop_background/desktop_background_view.h"
#include "ash/drag_drop/drag_drop_controller.h"
#include "ash/focus_cycler.h"
-#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/launcher/launcher.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/monitor/monitor_controller.h"
@@ -755,7 +754,6 @@ void Shell::Init() {
drag_drop_controller_.reset(new internal::DragDropController);
magnification_controller_.reset(new internal::MagnificationController);
- high_contrast_controller_.reset(new HighContrastController);
power_button_controller_.reset(new PowerButtonController);
AddShellObserver(power_button_controller_.get());
video_detector_.reset(new VideoDetector);
diff --git a/ash/shell.h b/ash/shell.h
index fa8c50d..ca2e91e 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -53,7 +53,6 @@ namespace ash {
class AcceleratorController;
class DesktopBackgroundController;
-class HighContrastController;
class Launcher;
class NestedDispatcherController;
class PowerButtonController;
@@ -238,14 +237,9 @@ class ASH_EXPORT Shell {
return user_wallpaper_delegate_.get();
}
- HighContrastController* high_contrast_controller() {
- return high_contrast_controller_.get();
- }
-
internal::MagnificationController* magnification_controller() {
return magnification_controller_.get();
}
-
internal::ScreenDimmer* screen_dimmer() {
return screen_dimmer_.get();
}
@@ -354,7 +348,6 @@ class ASH_EXPORT Shell {
scoped_ptr<internal::FocusCycler> focus_cycler_;
scoped_ptr<internal::EventClientImpl> event_client_;
scoped_ptr<internal::MonitorController> monitor_controller_;
- scoped_ptr<HighContrastController> high_contrast_controller_;
scoped_ptr<internal::MagnificationController> magnification_controller_;
scoped_ptr<internal::ScreenDimmer> screen_dimmer_;