Consolidate dialog style flags and strings; etc.

ui/base/ui_base_switches.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.
 
 // Defines all the command-line switches used by ui/base.
 
 #ifndef UI_BASE_UI_BASE_SWITCHES_H_
 #define UI_BASE_UI_BASE_SWITCHES_H_
 
 #include "base/compiler_specific.h"
 #include "ui/base/ui_export.h"
 
 namespace switches {
 
+UI_EXPORT extern const char kDisableTouchAdjustment[];
 UI_EXPORT extern const char kEnableBezelTouch[];
-UI_EXPORT extern const char kDisableTouchAdjustment[];
+UI_EXPORT extern const char kEnableNewDialogStyle[];
+UI_EXPORT extern const char kEnableNewMenuStyle[];
+UI_EXPORT extern const char kEnableTouchDragDrop[];
 UI_EXPORT extern const char kEnableViewsTextfield[];
 UI_EXPORT extern const char kForceDeviceScaleFactor[];
 UI_EXPORT extern const char kHighlightMissingScaledResources[];
 UI_EXPORT extern const char kLang[];
 UI_EXPORT extern const char kLocalePak[];
 UI_EXPORT extern const char kOldCheckboxStyle[];
 UI_EXPORT extern const char kNoMessageBox[];
 UI_EXPORT extern const char kTouchEvents[];
 UI_EXPORT extern const char kTouchEventsAuto[];
 UI_EXPORT extern const char kTouchEventsDisabled[];
 UI_EXPORT extern const char kTouchEventsEnabled[];
 UI_EXPORT extern const char kTouchOptimizedUI[];
 UI_EXPORT extern const char kTouchOptimizedUIAuto[];
 UI_EXPORT extern const char kTouchOptimizedUIDisabled[];
 UI_EXPORT extern const char kTouchOptimizedUIEnabled[];
-UI_EXPORT extern const char kEnableNewMenuStyle[];
 
 #if defined(USE_XI2_MT)
 UI_EXPORT extern const char kTouchCalibration[];
 #endif
 
 #if defined(OS_MACOSX)
 // TODO(kbr): remove this and the associated old code path:
 // http://crbug.com/105344
 // This isn't really the right place for this switch, but is the most
 // convenient place where it can be shared between
 // src/webkit/plugins/npapi/ and src/content/plugin/ .
 UI_EXPORT extern const char kDisableCompositedCoreAnimationPlugins[];
 UI_EXPORT extern const char kDisableCoreAnimationPlugins[];
 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 UI_EXPORT extern const char kTouchDevices[];
 #endif
 
-UI_EXPORT extern const char kEnableTouchDragDrop[];
 }  // namespace switches
 
 #endif  // UI_BASE_UI_BASE_SWITCHES_H_