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

@ -29,7 +29,7 @@ class CefMenuCreator : public CefMenuModelImpl::Delegate {
};
explicit CefMenuCreator(CefBrowserHostImpl* browser);
virtual ~CefMenuCreator();
~CefMenuCreator() override;
// Returns true if the context menu is currently showing.
bool IsShowingContextMenu();
@ -47,12 +47,12 @@ class CefMenuCreator : public CefMenuModelImpl::Delegate {
bool CreateRunner();
// CefMenuModelImpl::Delegate methods.
virtual void ExecuteCommand(CefRefPtr<CefMenuModelImpl> source,
int command_id,
cef_event_flags_t event_flags) OVERRIDE;
virtual void MenuWillShow(CefRefPtr<CefMenuModelImpl> source) OVERRIDE;
virtual void MenuClosed(CefRefPtr<CefMenuModelImpl> source) OVERRIDE;
virtual bool FormatLabel(base::string16& label) OVERRIDE;
void ExecuteCommand(CefRefPtr<CefMenuModelImpl> source,
int command_id,
cef_event_flags_t event_flags) override;
void MenuWillShow(CefRefPtr<CefMenuModelImpl> source) override;
void MenuClosed(CefRefPtr<CefMenuModelImpl> source) override;
bool FormatLabel(base::string16& label) override;
// Create the default menu model.
void CreateDefaultModel();