| Index: content/browser/gpu/gpu_blacklist.h
|
| ===================================================================
|
| --- content/browser/gpu/gpu_blacklist.h (revision 158210)
|
| +++ content/browser/gpu/gpu_blacklist.h (working copy)
|
| @@ -16,7 +16,6 @@
|
| #include "build/build_config.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/common/gpu_feature_type.h"
|
| -#include "content/public/common/gpu_switching_option.h"
|
|
|
| class Version;
|
|
|
| @@ -48,7 +47,7 @@
|
|
|
| Decision()
|
| : blacklisted_features(content::GPU_FEATURE_TYPE_UNKNOWN),
|
| - gpu_switching(content::GPU_SWITCHING_OPTION_UNKNOWN) {
|
| + gpu_switching(content::GPU_SWITCHING_AUTOMATIC) {
|
| }
|
| };
|
|
|
|
|
| Property changes on: content/browser/gpu/gpu_blacklist.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|