Index: gpu/config/gpu_util.h |
=================================================================== |
--- gpu/config/gpu_util.h (revision 0) |
+++ gpu/config/gpu_util.h (working copy) |
@@ -2,38 +2,31 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_BROWSER_GPU_GPU_UTIL_H_ |
-#define CONTENT_BROWSER_GPU_GPU_UTIL_H_ |
+#ifndef GPU_CONFIG_GPU_UTIL_H_ |
+#define GPU_CONFIG_GPU_UTIL_H_ |
#include <set> |
#include <string> |
-#include "base/basictypes.h" |
#include "build/build_config.h" |
-#include "content/common/content_export.h" |
-#include "content/public/common/gpu_switching_option.h" |
+#include "gpu/config/gpu_switching_option.h" |
+#include "gpu/gpu_export.h" |
-namespace content { |
-class GpuBlacklist; |
+namespace gpu { |
// Maps string to GpuSwitchingOption; returns GPU_SWITCHING_UNKNOWN if an |
// unknown name is input (case-sensitive). |
-CONTENT_EXPORT GpuSwitchingOption StringToGpuSwitchingOption( |
+GPU_EXPORT GpuSwitchingOption StringToGpuSwitchingOption( |
const std::string& switching_string); |
// Gets a string version of a GpuSwitchingOption. |
-CONTENT_EXPORT std::string GpuSwitchingOptionToString( |
- GpuSwitchingOption option); |
+GPU_EXPORT std::string GpuSwitchingOptionToString(GpuSwitchingOption option); |
-// Send UMA histograms about the enabled features. |
-CONTENT_EXPORT void UpdateStats( |
- const GpuBlacklist* blacklist, const std::set<int>& blacklisted_features); |
- |
// Merge features in src into dst. |
-CONTENT_EXPORT void MergeFeatureSets( |
+GPU_EXPORT void MergeFeatureSets( |
std::set<int>* dst, const std::set<int>& src); |
-} // namespace content |
+} // namespace gpu |
-#endif // CONTENT_BROWSER_GPU_GPU_UTIL_H_ |
+#endif // GPU_CONFIG_GPU_UTIL_H_ |