Update to Chromium revision 40af916d (#303546).

- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-11-12 19:25:15 +00:00
parent 470518a52e
commit eef89ccdd3
329 changed files with 3160 additions and 3731 deletions

View File

@ -38,13 +38,13 @@ class CefBinaryValueImpl
base::BinaryValue* CopyOrDetachValue(CefValueController* new_controller);
// CefBinaryValue methods.
virtual bool IsValid() OVERRIDE;
virtual bool IsOwned() OVERRIDE;
virtual CefRefPtr<CefBinaryValue> Copy() OVERRIDE;
virtual size_t GetSize() OVERRIDE;
virtual size_t GetData(void* buffer,
size_t buffer_size,
size_t data_offset) OVERRIDE;
bool IsValid() override;
bool IsOwned() override;
CefRefPtr<CefBinaryValue> Copy() override;
size_t GetSize() override;
size_t GetData(void* buffer,
size_t buffer_size,
size_t data_offset) override;
private:
// See the CefValueBase constructor for usage. Binary values are always
@ -90,37 +90,37 @@ class CefDictionaryValueImpl
base::DictionaryValue* CopyOrDetachValue(CefValueController* new_controller);
// CefDictionaryValue methods.
virtual bool IsValid() OVERRIDE;
virtual bool IsOwned() OVERRIDE;
virtual bool IsReadOnly() OVERRIDE;
virtual CefRefPtr<CefDictionaryValue> Copy(
bool exclude_empty_children) OVERRIDE;
virtual size_t GetSize() OVERRIDE;
virtual bool Clear() OVERRIDE;
virtual bool HasKey(const CefString& key) OVERRIDE;
virtual bool GetKeys(KeyList& keys) OVERRIDE;
virtual bool Remove(const CefString& key) OVERRIDE;
virtual CefValueType GetType(const CefString& key) OVERRIDE;
virtual bool GetBool(const CefString& key) OVERRIDE;
virtual int GetInt(const CefString& key) OVERRIDE;
virtual double GetDouble(const CefString& key) OVERRIDE;
virtual CefString GetString(const CefString& key) OVERRIDE;
virtual CefRefPtr<CefBinaryValue> GetBinary(const CefString& key) OVERRIDE;
virtual CefRefPtr<CefDictionaryValue> GetDictionary(
const CefString& key) OVERRIDE;
virtual CefRefPtr<CefListValue> GetList(const CefString& key) OVERRIDE;
virtual bool SetNull(const CefString& key) OVERRIDE;
virtual bool SetBool(const CefString& key, bool value) OVERRIDE;
virtual bool SetInt(const CefString& key, int value) OVERRIDE;
virtual bool SetDouble(const CefString& key, double value) OVERRIDE;
virtual bool SetString(const CefString& key,
const CefString& value) OVERRIDE;
virtual bool SetBinary(const CefString& key,
CefRefPtr<CefBinaryValue> value) OVERRIDE;
virtual bool SetDictionary(const CefString& key,
CefRefPtr<CefDictionaryValue> value) OVERRIDE;
virtual bool SetList(const CefString& key,
CefRefPtr<CefListValue> value) OVERRIDE;
bool IsValid() override;
bool IsOwned() override;
bool IsReadOnly() override;
CefRefPtr<CefDictionaryValue> Copy(
bool exclude_empty_children) override;
size_t GetSize() override;
bool Clear() override;
bool HasKey(const CefString& key) override;
bool GetKeys(KeyList& keys) override;
bool Remove(const CefString& key) override;
CefValueType GetType(const CefString& key) override;
bool GetBool(const CefString& key) override;
int GetInt(const CefString& key) override;
double GetDouble(const CefString& key) override;
CefString GetString(const CefString& key) override;
CefRefPtr<CefBinaryValue> GetBinary(const CefString& key) override;
CefRefPtr<CefDictionaryValue> GetDictionary(
const CefString& key) override;
CefRefPtr<CefListValue> GetList(const CefString& key) override;
bool SetNull(const CefString& key) override;
bool SetBool(const CefString& key, bool value) override;
bool SetInt(const CefString& key, int value) override;
bool SetDouble(const CefString& key, double value) override;
bool SetString(const CefString& key,
const CefString& value) override;
bool SetBinary(const CefString& key,
CefRefPtr<CefBinaryValue> value) override;
bool SetDictionary(const CefString& key,
CefRefPtr<CefDictionaryValue> value) override;
bool SetList(const CefString& key,
CefRefPtr<CefListValue> value) override;
private:
// See the CefValueBase constructor for usage.
@ -163,31 +163,31 @@ class CefListValueImpl
base::ListValue* CopyOrDetachValue(CefValueController* new_controller);
/// CefListValue methods.
virtual bool IsValid() OVERRIDE;
virtual bool IsOwned() OVERRIDE;
virtual bool IsReadOnly() OVERRIDE;
virtual CefRefPtr<CefListValue> Copy() OVERRIDE;
virtual bool SetSize(size_t size) OVERRIDE;
virtual size_t GetSize() OVERRIDE;
virtual bool Clear() OVERRIDE;
virtual bool Remove(int index) OVERRIDE;
virtual CefValueType GetType(int index) OVERRIDE;
virtual bool GetBool(int index) OVERRIDE;
virtual int GetInt(int index) OVERRIDE;
virtual double GetDouble(int index) OVERRIDE;
virtual CefString GetString(int index) OVERRIDE;
virtual CefRefPtr<CefBinaryValue> GetBinary(int index) OVERRIDE;
virtual CefRefPtr<CefDictionaryValue> GetDictionary(int index) OVERRIDE;
virtual CefRefPtr<CefListValue> GetList(int index) OVERRIDE;
virtual bool SetNull(int index) OVERRIDE;
virtual bool SetBool(int index, bool value) OVERRIDE;
virtual bool SetInt(int index, int value) OVERRIDE;
virtual bool SetDouble(int index, double value) OVERRIDE;
virtual bool SetString(int index, const CefString& value) OVERRIDE;
virtual bool SetBinary(int index, CefRefPtr<CefBinaryValue> value) OVERRIDE;
virtual bool SetDictionary(int index,
CefRefPtr<CefDictionaryValue> value) OVERRIDE;
virtual bool SetList(int index, CefRefPtr<CefListValue> value) OVERRIDE;
bool IsValid() override;
bool IsOwned() override;
bool IsReadOnly() override;
CefRefPtr<CefListValue> Copy() override;
bool SetSize(size_t size) override;
size_t GetSize() override;
bool Clear() override;
bool Remove(int index) override;
CefValueType GetType(int index) override;
bool GetBool(int index) override;
int GetInt(int index) override;
double GetDouble(int index) override;
CefString GetString(int index) override;
CefRefPtr<CefBinaryValue> GetBinary(int index) override;
CefRefPtr<CefDictionaryValue> GetDictionary(int index) override;
CefRefPtr<CefListValue> GetList(int index) override;
bool SetNull(int index) override;
bool SetBool(int index, bool value) override;
bool SetInt(int index, int value) override;
bool SetDouble(int index, double value) override;
bool SetString(int index, const CefString& value) override;
bool SetBinary(int index, CefRefPtr<CefBinaryValue> value) override;
bool SetDictionary(int index,
CefRefPtr<CefDictionaryValue> value) override;
bool SetList(int index, CefRefPtr<CefListValue> value) override;
private:
// See the CefValueBase constructor for usage.