Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(905)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2642853006: Remove the ash-enable-touch-view-testing flag (Closed)
Patch Set: Fix tests Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, 1020 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS,
1021 SINGLE_DISABLE_VALUE_TYPE( 1021 SINGLE_DISABLE_VALUE_TYPE(
1022 ash::switches::kAshDisableMaximizeModeWindowBackdrop), 1022 ash::switches::kAshDisableMaximizeModeWindowBackdrop),
1023 }, 1023 },
1024 { 1024 {
1025 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME, 1025 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME,
1026 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll, 1026 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll,
1027 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows), 1027 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows),
1028 }, 1028 },
1029 { 1029 {
1030 "ash-enable-touch-view-testing",
1031 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME,
1032 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, kOsCrOS,
1033 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting),
1034 },
1035 {
1036 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, 1030 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME,
1037 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, 1031 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS,
1038 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), 1032 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen),
1039 }, 1033 },
1040 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS, 1034 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS,
1041 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)}, 1035 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)},
1042 #endif // USE_ASH 1036 #endif // USE_ASH
1043 #if defined(OS_CHROMEOS) 1037 #if defined(OS_CHROMEOS)
1044 {"material-design-ink-drop-animation-speed", 1038 {"material-design-ink-drop-animation-speed",
1045 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, 1039 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME,
(...skipping 1336 matching lines...) Expand 10 before | Expand all | Expand 10 after
2382 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2376 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2383 2377
2384 const FeatureEntry* GetFeatureEntries(size_t* count) { 2378 const FeatureEntry* GetFeatureEntries(size_t* count) {
2385 *count = arraysize(kFeatureEntries); 2379 *count = arraysize(kFeatureEntries);
2386 return kFeatureEntries; 2380 return kFeatureEntries;
2387 } 2381 }
2388 2382
2389 } // namespace testing 2383 } // namespace testing
2390 2384
2391 } // namespace about_flags 2385 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698