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

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

Issue 23506029: Enabling the new drag off shellf feature by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unnecessary log statement Created 7 years, 3 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 }, 919 },
920 #if defined(OS_CHROMEOS) 920 #if defined(OS_CHROMEOS)
921 { 921 {
922 "ash-use-alternate-shelf", 922 "ash-use-alternate-shelf",
923 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, 923 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME,
924 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, 924 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION,
925 kOsCrOS, 925 kOsCrOS,
926 SINGLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout) 926 SINGLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout)
927 }, 927 },
928 { 928 {
929 "ash-enable-drag-off-shelf", 929 "ash-disable-drag-off-shelf",
930 IDS_FLAGS_DRAG_OFF_SHELF_NAME, 930 IDS_FLAGS_DRAG_OFF_SHELF_NAME,
931 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION, 931 IDS_FLAGS_DRAG_OFF_SHELF_DESCRIPTION,
932 kOsCrOS, 932 kOsCrOS,
933 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDragOffShelf) 933 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf)
934 }, 934 },
935 { 935 {
936 "enable-background-loader", 936 "enable-background-loader",
937 IDS_ENABLE_BACKLOADER_NAME, 937 IDS_ENABLE_BACKLOADER_NAME,
938 IDS_ENABLE_BACKLOADER_DESCRIPTION, 938 IDS_ENABLE_BACKLOADER_DESCRIPTION,
939 kOsCrOS, 939 kOsCrOS,
940 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader) 940 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader)
941 }, 941 },
942 { 942 {
943 "enable-screensaver-extension", 943 "enable-screensaver-extension",
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
2121 } 2121 }
2122 2122
2123 const Experiment* GetExperiments(size_t* count) { 2123 const Experiment* GetExperiments(size_t* count) {
2124 *count = num_experiments; 2124 *count = num_experiments;
2125 return experiments; 2125 return experiments;
2126 } 2126 }
2127 2127
2128 } // namespace testing 2128 } // namespace testing
2129 2129
2130 } // namespace about_flags 2130 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698