Index: gpu/config/gpu_control_list.h |
=================================================================== |
--- gpu/config/gpu_control_list.h (revision 0) |
+++ gpu/config/gpu_control_list.h (working copy) |
@@ -2,8 +2,8 @@ |
// 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_CONTROL_LIST_H_ |
-#define CONTENT_BROWSER_GPU_GPU_CONTROL_LIST_H_ |
+#ifndef GPU_CONFIG_GPU_CONTROL_LIST_H_ |
+#define GPU_CONFIG_GPU_CONTROL_LIST_H_ |
#include <set> |
#include <string> |
@@ -16,12 +16,12 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/values.h" |
#include "build/build_config.h" |
-#include "content/common/content_export.h" |
+#include "gpu/gpu_export.h" |
-namespace content { |
+namespace gpu { |
struct GPUInfo; |
-class CONTENT_EXPORT GpuControlList { |
+class GPU_EXPORT GpuControlList { |
public: |
enum OsType { |
kOsLinux, |
@@ -121,7 +121,7 @@ |
kUnknown // Indicates the data is invalid. |
}; |
- class CONTENT_EXPORT VersionInfo { |
+ class GPU_EXPORT VersionInfo { |
public: |
// If version_style is empty, it defaults to kNumerical. |
VersionInfo(const std::string& version_op, |
@@ -171,7 +171,7 @@ |
std::vector<std::string> version2_; |
}; |
- class CONTENT_EXPORT OsInfo { |
+ class GPU_EXPORT OsInfo { |
public: |
OsInfo(const std::string& os, |
const std::string& version_op, |
@@ -195,7 +195,7 @@ |
scoped_ptr<VersionInfo> version_info_; |
}; |
- class CONTENT_EXPORT StringInfo { |
+ class GPU_EXPORT StringInfo { |
public: |
StringInfo(const std::string& string_op, const std::string& string_value); |
@@ -221,7 +221,7 @@ |
std::string value_; |
}; |
- class CONTENT_EXPORT FloatInfo { |
+ class GPU_EXPORT FloatInfo { |
public: |
FloatInfo(const std::string& float_op, |
const std::string& float_value, |
@@ -239,7 +239,7 @@ |
float value2_; |
}; |
- class CONTENT_EXPORT IntInfo { |
+ class GPU_EXPORT IntInfo { |
public: |
IntInfo(const std::string& int_op, |
const std::string& int_value, |
@@ -257,7 +257,7 @@ |
int value2_; |
}; |
- class CONTENT_EXPORT MachineModelInfo { |
+ class GPU_EXPORT MachineModelInfo { |
public: |
MachineModelInfo(const std::string& name_op, |
const std::string& name_value, |
@@ -282,7 +282,7 @@ |
typedef base::hash_map<std::string, int> FeatureMap; |
- class CONTENT_EXPORT GpuControlListEntry |
+ class GPU_EXPORT GpuControlListEntry |
: public base::RefCounted<GpuControlListEntry> { |
public: |
// Constructs GpuControlListEntry from DictionaryValue loaded from json. |
@@ -492,7 +492,7 @@ |
bool supports_feature_type_all_; |
}; |
-} // namespace content |
+} // namespace gpu |
-#endif // CONTENT_BROWSER_GPU_GPU_CONTROL_LIST_H_ |
+#endif // GPU_CONFIG_GPU_CONTROL_LIST_H_ |