summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 20:27:13 +0000
committerrharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 20:27:13 +0000
commitcc38f97853d14feb180e74f4c765a8130c6ab636 (patch)
treed07af712002075491abbe14d2e6e6c7ad724d444
parent6397752c160864053c439f4b3948b620c281aacb (diff)
downloadchromium_src-cc38f97853d14feb180e74f4c765a8130c6ab636.zip
chromium_src-cc38f97853d14feb180e74f4c765a8130c6ab636.tar.gz
chromium_src-cc38f97853d14feb180e74f4c765a8130c6ab636.tar.bz2
Remove references to "enable-bezel-touch" flag
The features related to this flag were removed in https://chromiumcodereview.appspot.com/13648005 and there are no plans to reimplement them. This CL is a clean up removing the flags bits that should hve been removed with the feature. BUG=222746 TEST=Built image and confirmed gestures/touches on the edge of the screen did not have any regressions. Review URL: https://chromiumcodereview.appspot.com/16967002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206157 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ash/wm/system_gesture_event_filter_unittest.cc2
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc7
-rw-r--r--ui/base/ui_base_switches.cc3
-rw-r--r--ui/base/ui_base_switches.h1
5 files changed, 0 insertions, 19 deletions
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index c46ce88..ce02fad 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -213,8 +213,6 @@ class SystemGestureEventFilterTest : public AshTestBase {
virtual void SetUp() OVERRIDE {
CommandLine::ForCurrentProcess()->AppendSwitch(
ash::switches::kAshEnableAdvancedGestures);
- CommandLine::ForCurrentProcess()->AppendSwitch(
- ::switches::kEnableBezelTouch);
test::AshTestBase::SetUp();
// Enable brightness key.
test::DisplayManagerTestApi(Shell::GetInstance()->display_manager()).
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index c964f23..e959941 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6274,12 +6274,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_ENABLE_BACKLOADER_DESCRIPTION" desc="Description of the enable background loader flag.">
Enable background loader component for hosted applications.
</message>
- <message name="IDS_ENABLE_BEZEL_TOUCH_NAME" desc="Title of the enble bezel touch actions flag." >
- Enable bezel touch actions
- </message>
- <message name="IDS_ENABLE_BEZEL_TOUCH_DESCRIPTION" desc="Description of the enable bezel touch actions flag.">
- Enable bezel touch actions.
- </message>
<message name="IDS_ENABLE_SCREENSAVER_EXTENSION_NAME" desc="Title of the enble screensaver extensions flag." >
Enable screensaver extensions.
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 834073d..a723e2e 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -913,13 +913,6 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader)
},
{
- "enable-bezel-touch",
- IDS_ENABLE_BEZEL_TOUCH_NAME,
- IDS_ENABLE_BEZEL_TOUCH_DESCRIPTION,
- kOsCrOS,
- SINGLE_VALUE_TYPE(switches::kEnableBezelTouch)
- },
- {
"enable-screensaver-extension",
IDS_ENABLE_SCREENSAVER_EXTENSION_NAME,
IDS_ENABLE_SCREENSAVER_EXTENSION_DESCRIPTION,
diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc
index 51a9546..de90251 100644
--- a/ui/base/ui_base_switches.cc
+++ b/ui/base/ui_base_switches.cc
@@ -24,9 +24,6 @@ const char kDisableTouchEditing[] = "disable-touch-editing";
// Disables the Views textfield on Windows.
const char kDisableViewsTextfield[] = "disable-views-textfield";
-// Enables support for bezel touch.
-const char kEnableBezelTouch[] = "enable-bezel-touch";
-
// Enables the new visual style for application dialogs and controls.
const char kEnableNewDialogStyle[] = "enable-new-dialog-style";
diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h
index dfaed583..78fa394 100644
--- a/ui/base/ui_base_switches.h
+++ b/ui/base/ui_base_switches.h
@@ -18,7 +18,6 @@ UI_EXPORT extern const char kDisableTouchAdjustment[];
UI_EXPORT extern const char kDisableTouchDragDrop[];
UI_EXPORT extern const char kDisableTouchEditing[];
UI_EXPORT extern const char kDisableViewsTextfield[];
-UI_EXPORT extern const char kEnableBezelTouch[];
UI_EXPORT extern const char kEnableNewDialogStyle[];
UI_EXPORT extern const char kEnableTouchDragDrop[];
UI_EXPORT extern const char kEnableTouchEditing[];