Index: content/browser/gpu/gpu_util.h |
=================================================================== |
--- content/browser/gpu/gpu_util.h (revision 158210) |
+++ content/browser/gpu/gpu_util.h (working copy) |
@@ -11,7 +11,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 GpuBlacklist; |
@@ -33,10 +32,6 @@ |
CONTENT_EXPORT content::GpuSwitchingOption StringToGpuSwitchingOption( |
const std::string& switching_string); |
-// Gets a string version of a GpuSwitchingOption. |
-CONTENT_EXPORT std::string GpuSwitchingOptionToString( |
- content::GpuSwitchingOption option); |
- |
// Send UMA histograms about the enabled features. |
CONTENT_EXPORT void UpdateStats( |
const GpuBlacklist* blacklist, uint32 blacklisted_features); |
Property changes on: content/browser/gpu/gpu_util.h |
___________________________________________________________________ |
Deleted: svn:mergeinfo |