| OLD | NEW | 
|---|
| 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> | 
| 11 | 11 | 
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" | 
| 13 #include "base/memory/singleton.h" | 13 #include "base/memory/singleton.h" | 
| 14 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" | 
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" | 
| 16 #include "base/values.h" | 16 #include "base/values.h" | 
|  | 17 #include "cc/switches.h" | 
| 17 #include "chrome/browser/prefs/pref_service.h" | 18 #include "chrome/browser/prefs/pref_service.h" | 
| 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 19 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 
| 19 #include "chrome/common/chrome_content_client.h" | 20 #include "chrome/common/chrome_content_client.h" | 
| 20 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" | 
| 21 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" | 
| 22 #include "content/public/browser/user_metrics.h" | 23 #include "content/public/browser/user_metrics.h" | 
| 23 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" | 
| 24 #include "media/base/media_switches.h" | 25 #include "media/base/media_switches.h" | 
| 25 #include "ui/app_list/app_list_switches.h" | 26 #include "ui/app_list/app_list_switches.h" | 
| 26 #include "ui/base/l10n/l10n_util.h" | 27 #include "ui/base/l10n/l10n_util.h" | 
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 303     IDS_FLAGS_DISABLE_DEFERRED_2D_CANVAS_NAME, | 304     IDS_FLAGS_DISABLE_DEFERRED_2D_CANVAS_NAME, | 
| 304     IDS_FLAGS_DISABLE_DEFERRED_2D_CANVAS_DESCRIPTION, | 305     IDS_FLAGS_DISABLE_DEFERRED_2D_CANVAS_DESCRIPTION, | 
| 305     kOsAll, | 306     kOsAll, | 
| 306     SINGLE_VALUE_TYPE(switches::kDisableDeferred2dCanvas) | 307     SINGLE_VALUE_TYPE(switches::kDisableDeferred2dCanvas) | 
| 307   }, | 308   }, | 
| 308   { | 309   { | 
| 309     "disable-threaded-animation", | 310     "disable-threaded-animation", | 
| 310     IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME, | 311     IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME, | 
| 311     IDS_FLAGS_DISABLE_THREADED_ANIMATION_DESCRIPTION, | 312     IDS_FLAGS_DISABLE_THREADED_ANIMATION_DESCRIPTION, | 
| 312     kOsAll, | 313     kOsAll, | 
| 313     SINGLE_VALUE_TYPE(switches::kDisableThreadedAnimation) | 314     SINGLE_VALUE_TYPE(cc::switches::kDisableThreadedAnimation) | 
| 314   }, | 315   }, | 
| 315   { | 316   { | 
| 316     "composited-layer-borders", | 317     "composited-layer-borders", | 
| 317     IDS_FLAGS_COMPOSITED_LAYER_BORDERS, | 318     IDS_FLAGS_COMPOSITED_LAYER_BORDERS, | 
| 318     IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, | 319     IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, | 
| 319     kOsAll, | 320     kOsAll, | 
| 320     SINGLE_VALUE_TYPE(switches::kShowCompositedLayerBorders) | 321     SINGLE_VALUE_TYPE(switches::kShowCompositedLayerBorders) | 
| 321   }, | 322   }, | 
| 322   { | 323   { | 
| 323     "show-fps-counter", | 324     "show-fps-counter", | 
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 611 #endif | 612 #endif | 
| 612   { | 613   { | 
| 613     "per-tile-painting", | 614     "per-tile-painting", | 
| 614     IDS_FLAGS_PER_TILE_PAINTING_NAME, | 615     IDS_FLAGS_PER_TILE_PAINTING_NAME, | 
| 615     IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, | 616     IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, | 
| 616 #if defined(USE_SKIA) | 617 #if defined(USE_SKIA) | 
| 617     kOsMac | kOsLinux | kOsCrOS, | 618     kOsMac | kOsLinux | kOsCrOS, | 
| 618 #else | 619 #else | 
| 619     0, | 620     0, | 
| 620 #endif | 621 #endif | 
| 621     SINGLE_VALUE_TYPE(switches::kEnablePerTilePainting) | 622     SINGLE_VALUE_TYPE(cc::switches::kEnablePerTilePainting) | 
| 622   }, | 623   }, | 
| 623   { | 624   { | 
| 624     "enable-javascript-harmony", | 625     "enable-javascript-harmony", | 
| 625     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, | 626     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, | 
| 626     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, | 627     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, | 
| 627     kOsAll, | 628     kOsAll, | 
| 628     SINGLE_VALUE_TYPE_AND_VALUE(switches::kJavaScriptFlags, "--harmony") | 629     SINGLE_VALUE_TYPE_AND_VALUE(switches::kJavaScriptFlags, "--harmony") | 
| 629   }, | 630   }, | 
| 630   { | 631   { | 
| 631     "enable-tab-browser-dragging", | 632     "enable-tab-browser-dragging", | 
| (...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1391 } | 1392 } | 
| 1392 | 1393 | 
| 1393 const Experiment* GetExperiments(size_t* count) { | 1394 const Experiment* GetExperiments(size_t* count) { | 
| 1394   *count = num_experiments; | 1395   *count = num_experiments; | 
| 1395   return experiments; | 1396   return experiments; | 
| 1396 } | 1397 } | 
| 1397 | 1398 | 
| 1398 }  // namespace testing | 1399 }  // namespace testing | 
| 1399 | 1400 | 
| 1400 }  // namespace about_flags | 1401 }  // namespace about_flags | 
| OLD | NEW | 
|---|