Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(983)

Unified Diff: third_party/WebKit/Source/platform/inspector_protocol/Values.h

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/inspector_protocol/Values.h
diff --git a/third_party/WebKit/Source/platform/inspector_protocol/Values.h b/third_party/WebKit/Source/platform/inspector_protocol/Values.h
index f7147a046f3297774fe47f802cd91e58275b646f..23688e9b0879810a3f0da3973d2ce2836c200684 100644
--- a/third_party/WebKit/Source/platform/inspector_protocol/Values.h
+++ b/third_party/WebKit/Source/platform/inspector_protocol/Values.h
@@ -33,16 +33,16 @@ public:
return adoptRef(new Value());
}
- typedef enum {
+ enum ValueType {
TypeNull = 0,
TypeBoolean,
TypeNumber,
TypeString,
TypeObject,
TypeArray
- } Type;
+ };
- Type type() const { return m_type; }
+ ValueType type() const { return m_type; }
bool isNull() const { return m_type == TypeNull; }
@@ -56,13 +56,13 @@ public:
protected:
Value() : m_type(TypeNull) { }
- explicit Value(Type type) : m_type(type) { }
+ explicit Value(ValueType type) : m_type(type) { }
private:
friend class DictionaryValue;
friend class ListValue;
- Type m_type;
+ ValueType m_type;
};
class PLATFORM_EXPORT FundamentalValue : public Value {

Powered by Google App Engine
This is Rietveld 408576698