OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) | 310 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) |
311 }, | 311 }, |
312 { | 312 { |
313 "prerender-from-omnibox", // FLAGS:RECORD_UMA | 313 "prerender-from-omnibox", // FLAGS:RECORD_UMA |
314 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_NAME, | 314 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_NAME, |
315 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_DESCRIPTION, | 315 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_DESCRIPTION, |
316 kOsAll, | 316 kOsAll, |
317 MULTI_VALUE_TYPE(kPrerenderFromOmniboxChoices) | 317 MULTI_VALUE_TYPE(kPrerenderFromOmniboxChoices) |
318 }, | 318 }, |
319 { | 319 { |
320 "disable-panels", | 320 "enable-panels", |
321 IDS_FLAGS_DISABLE_PANELS_NAME, | 321 IDS_FLAGS_ENABLE_PANELS_NAME, |
322 IDS_FLAGS_DISABLE_PANELS_DESCRIPTION, | 322 IDS_FLAGS_ENABLE_PANELS_DESCRIPTION, |
323 kOsAll, | 323 kOsAll, |
324 SINGLE_VALUE_TYPE(switches::kDisablePanels) | 324 SINGLE_VALUE_TYPE(switches::kEnablePanels) |
325 }, | 325 }, |
326 { | 326 { |
327 "disable-shortcuts-provider", | 327 "disable-shortcuts-provider", |
328 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER, | 328 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER, |
329 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER_DESCRIPTION, | 329 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER_DESCRIPTION, |
330 kOsAll, | 330 kOsAll, |
331 SINGLE_VALUE_TYPE(switches::kDisableShortcutsProvider) | 331 SINGLE_VALUE_TYPE(switches::kDisableShortcutsProvider) |
332 }, | 332 }, |
333 #if defined(OS_CHROMEOS) | 333 #if defined(OS_CHROMEOS) |
334 { | 334 { |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
851 } | 851 } |
852 | 852 |
853 const Experiment* GetExperiments(size_t* count) { | 853 const Experiment* GetExperiments(size_t* count) { |
854 *count = num_experiments; | 854 *count = num_experiments; |
855 return experiments; | 855 return experiments; |
856 } | 856 } |
857 | 857 |
858 } // namespace testing | 858 } // namespace testing |
859 | 859 |
860 } // namespace about_flags | 860 } // namespace about_flags |
OLD | NEW |