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

@@ -24,7 +24,7 @@ class CefAuthCallbackImpl : public CefAuthCallback {
: callback_(callback),
credentials_(credentials) {
}
~CefAuthCallbackImpl() {
~CefAuthCallbackImpl() override {
if (!callback_.is_null()) {
// The auth callback is still pending. Cancel it now.
if (CEF_CURRENTLY_ON_IOT()) {
@@ -36,8 +36,8 @@ class CefAuthCallbackImpl : public CefAuthCallback {
}
}
virtual void Continue(const CefString& username,
const CefString& password) OVERRIDE {
void Continue(const CefString& username,
const CefString& password) override {
if (CEF_CURRENTLY_ON_IOT()) {
if (!callback_.is_null()) {
credentials_->Set(username, password);
@@ -50,7 +50,7 @@ class CefAuthCallbackImpl : public CefAuthCallback {
}
}
virtual void Cancel() OVERRIDE {
void Cancel() override {
if (CEF_CURRENTLY_ON_IOT()) {
if (!callback_.is_null()) {
CancelNow(callback_);