Turning off the bezel device control functionality

BUG=144708


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

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

2 files changed, 7 insertions, 2 deletions

diff --git a/ash/wm/gestures/bezel_gesture_handler.cc b/ash/wm/gestures/bezel_gesture_handler.cc
index db23e20..fd1329f 100644
--- a/ash/wm/gestures/bezel_gesture_handler.cc
+++ b/ash/wm/gestures/bezel_gesture_handler.cc
@@ -59,6 +59,9 @@ BezelGestureHandler::BezelGestureHandler()
       orientation_(SCROLL_ORIENTATION_UNSET),
       is_scrubbing_(false),
       initiation_delay_events_(0) {
+  enable_bezel_device_control_ =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+                ::switches::kEnableBezelTouch);
 }
 
 BezelGestureHandler::~BezelGestureHandler() {
@@ -200,8 +203,7 @@ void BezelGestureHandler::HandleBezelGestureUpdate(
         start_location_ = BEZEL_START_UNSET;
     } else {
       // Check if device gestures should be performed or not.
-      if (CommandLine::ForCurrentProcess()->HasSwitch(
-              ::switches::kDisableBezelTouch)) {
+      if (!enable_bezel_device_control_) {
         start_location_ = BEZEL_START_UNSET;
         return;
       }
diff --git a/ash/wm/gestures/bezel_gesture_handler.h b/ash/wm/gestures/bezel_gesture_handler.h
index ac007a5..3fd57e0 100644
--- a/ash/wm/gestures/bezel_gesture_handler.h
+++ b/ash/wm/gestures/bezel_gesture_handler.h
@@ -111,6 +111,9 @@ class BezelGestureHandler {
   // This is the counter which keeps track of the number of events passed.
   int initiation_delay_events_;
 
+  // True if device control bezel operations (brightness, volume) are enabled.
+  bool enable_bezel_device_control_;
+
   DISALLOW_COPY_AND_ASSIGN(BezelGestureHandler);
 };