Create VTVideoDecodeAccelerator

chrome/browser/about_flags.cc

 // 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.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 409 matching lines @@
 // associate the version with a FieldTrial. FieldTrials don't currently support
 // flag=value flags.
 const Experiment::Choice kMalwareInterstitialVersions[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2,
     switches::kMalwareInterstitialVersionV2, "" },
   { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3,
     switches::kMalwareInterstitialVersionV3, "" },
 };
 
-#if defined(OS_CHROMEOS)

[scherkus (not reviewing), 2014/06/09 16:02:06]

bad merge? looks like you have a bunch of related changes

[sandersd (OOO until July 31), 2014/06/10 01:02:44]

Ugh, that's no good. Probably happened when I transferred the branch from my
workstation to the laptop.

-const Experiment::Choice kEnableFileManagerMTPChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    chromeos::switches::kEnableFileManagerMTP, "true" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    chromeos::switches::kEnableFileManagerMTP, "false" }
-};
-#endif
-
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
 // gather statistics about the usage of your flag, you should append a marker
 // comment to the end of the feature name, like so:
 //   "my-special-feature",  // FLAGS:RECORD_UMA
 //
 // After doing that, run
 //   tools/metrics/actions/extract_actions.py
 // to add the metric to actions.xml (which will enable UMA to record your
@@ skipping 581 matching lines @@
     "disable-display-color-calibration",
     IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME,
     IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration),
   },
 #endif  // defined(OS_CHROMEOS)
   { "disable-accelerated-video-decode",
     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
-    kOsWin | kOsCrOS,
+    kOsMac | kOsWin | kOsCrOS,

[scherkus (not reviewing), 2014/06/09 16:02:06]

is this change needed or does --ignore-gpu-blacklist suffice for now

I believe the blacklist is the main mechanism that disables GPU decode on mac
today:
https://code.google.com/p/chromium/codesearch#chromium/src/gpu/config/softwar...
https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/gp...

[sandersd (OOO until July 31), 2014/06/10 01:02:44]

Done.

     SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
   },
 #if defined(USE_ASH)
   {
     "ash-debug-shortcuts",
     IDS_FLAGS_DEBUG_SHORTCUTS_NAME,
     IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts),
   },
@@ skipping 96 matching lines @@
     IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME,
     IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION,
     kOsWin | kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop,
                               switches::kDisableTouchDragDrop)
   },
   {
     "enable-touch-editing",
     IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME,
     IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION,
-    kOsCrOS | kOsWin | kOsLinux,
+    kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing,
                               switches::kDisableTouchEditing)
   },
   {
     "enable-suggestions-service",
     IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME,
     IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION,
     kOsAndroid | kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService,
                               switches::kDisableSuggestionsService)
@@ skipping 618 matching lines @@
     IDS_FLAGS_DISABLE_EMBEDDED_SHARED_WORKER_DESCRIPTION,
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kDisableEmbeddedSharedWorker)
   },
 #if defined(OS_CHROMEOS)
   {
     "enable-filemanager-mtp",
     IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME,
     IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION,
     kOsCrOS,
-    MULTI_VALUE_TYPE(kEnableFileManagerMTPChoices)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP)
   },
 #endif
   // TODO(tyoshino): Remove this temporary flag and command line switch. See
   // crbug.com/366483 for the target milestone.
   {
     "allow-insecure-websocket-from-https-origin",
     IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME,
     IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin)
@@ skipping 604 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags