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

@ -19,10 +19,10 @@ class CefJavaScriptDialog;
class CefJavaScriptDialogManager : public content::JavaScriptDialogManager {
public:
explicit CefJavaScriptDialogManager(CefBrowserHostImpl* browser);
virtual ~CefJavaScriptDialogManager();
~CefJavaScriptDialogManager() override;
// JavaScriptDialogManager methods.
virtual void RunJavaScriptDialog(
void RunJavaScriptDialog(
content::WebContents* web_contents,
const GURL& origin_url,
const std::string& accept_lang,
@ -30,19 +30,19 @@ class CefJavaScriptDialogManager : public content::JavaScriptDialogManager {
const base::string16& message_text,
const base::string16& default_prompt_text,
const DialogClosedCallback& callback,
bool* did_suppress_message) OVERRIDE;
bool* did_suppress_message) override;
virtual void RunBeforeUnloadDialog(
void RunBeforeUnloadDialog(
content::WebContents* web_contents,
const base::string16& message_text,
bool is_reload,
const DialogClosedCallback& callback) OVERRIDE;
const DialogClosedCallback& callback) override;
virtual void CancelActiveAndPendingDialogs(
content::WebContents* web_contents) OVERRIDE;
void CancelActiveAndPendingDialogs(
content::WebContents* web_contents) override;
virtual void WebContentsDestroyed(
content::WebContents* web_contents) OVERRIDE;
void WebContentsDestroyed(
content::WebContents* web_contents) override;
// Called by the CefJavaScriptDialog when it closes.
void DialogClosed(CefJavaScriptDialog* dialog);