Skip to content

Commit 8777c95

Browse files
committed
Fix OVERRIDE macro
1 parent 3d9ec80 commit 8777c95

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

cef/app.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ class App : public CefApp,
1919
// CefApp methods:
2020
virtual void OnBeforeCommandLineProcessing(
2121
const CefString& process_type,
22-
CefRefPtr<CefCommandLine> command_line) OVERRIDE;
22+
CefRefPtr<CefCommandLine> command_line) override;
2323

2424
virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler()
25-
OVERRIDE { return this; }
25+
override { return this; }
2626

2727
virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler()
28-
OVERRIDE { return this; }
28+
override { return this; }
2929

3030
// CefBrowserProcessHandler methods:
31-
virtual void OnContextInitialized() OVERRIDE;
31+
virtual void OnContextInitialized() override;
3232

3333
// CefRenderProcessHandler methods:
3434
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
3535
CefProcessId source_process,
3636
CefRefPtr<CefProcessMessage> message)
37-
OVERRIDE;
37+
override;
3838
virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
3939
CefRefPtr<CefFrame> frame,
40-
CefRefPtr<CefV8Context> context) OVERRIDE;
41-
virtual void OnBrowserCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
42-
virtual void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) OVERRIDE;
40+
CefRefPtr<CefV8Context> context) override;
41+
virtual void OnBrowserCreated(CefRefPtr<CefBrowser> browser) override;
42+
virtual void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) override;
4343

4444
protected:
4545
// There is one instance of JavascriptApi for each browser.

cef/client_handler.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ class ClientHandler : public CefClient,
2525
static ClientHandler* GetInstance();
2626

2727
// CefClient methods:
28-
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE {
28+
virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() override {
2929
return this;
3030
}
31-
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE {
31+
virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override {
3232
return this;
3333
}
34-
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE {
34+
virtual CefRefPtr<CefLoadHandler> GetLoadHandler() override {
3535
return this;
3636
}
3737
virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() {
@@ -52,15 +52,15 @@ class ClientHandler : public CefClient,
5252
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
5353
CefProcessId source_process,
5454
CefRefPtr<CefProcessMessage> message)
55-
OVERRIDE;
55+
override;
5656

5757
// CefDisplayHandler methods:
5858
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
59-
const CefString& title) OVERRIDE;
59+
const CefString& title) override;
6060

6161
// CefLifeSpanHandler methods:
62-
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
63-
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
62+
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) override;
63+
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;
6464
typedef cef_window_open_disposition_t WindowOpenDisposition;
6565
virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
6666
CefRefPtr<CefFrame> frame,
@@ -72,58 +72,58 @@ class ClientHandler : public CefClient,
7272
CefWindowInfo& windowInfo,
7373
CefRefPtr<CefClient>& client,
7474
CefBrowserSettings& settings,
75-
bool* no_javascript_access) OVERRIDE;
75+
bool* no_javascript_access) override;
7676

7777
// CefLoadHandler methods:
7878
virtual void OnLoadError(CefRefPtr<CefBrowser> browser,
7979
CefRefPtr<CefFrame> frame,
8080
ErrorCode errorCode,
8181
const CefString& errorText,
82-
const CefString& failedUrl) OVERRIDE;
82+
const CefString& failedUrl) override;
8383
virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
8484
bool isLoading,
8585
bool canGoBack,
86-
bool canGoForward) OVERRIDE;
86+
bool canGoForward) override;
8787

8888
// CefContextMenuHandler methods:
8989
virtual void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
9090
CefRefPtr<CefFrame> frame,
9191
CefRefPtr<CefContextMenuParams> params,
92-
CefRefPtr<CefMenuModel> model) OVERRIDE;
92+
CefRefPtr<CefMenuModel> model) override;
9393
virtual bool OnContextMenuCommand(CefRefPtr<CefBrowser> browser,
9494
CefRefPtr<CefFrame> frame,
9595
CefRefPtr<CefContextMenuParams> params,
9696
int command_id,
97-
EventFlags event_flags) OVERRIDE;
97+
EventFlags event_flags) override;
9898
virtual void OnContextMenuDismissed(CefRefPtr<CefBrowser> browser,
99-
CefRefPtr<CefFrame> frame) OVERRIDE;
99+
CefRefPtr<CefFrame> frame) override;
100100

101101
// CefDragHandler methods:
102102
virtual bool OnDragEnter(CefRefPtr<CefBrowser> browser,
103103
CefRefPtr<CefDragData> dragData,
104-
DragOperationsMask mask) OVERRIDE;
104+
DragOperationsMask mask) override;
105105

106106
// CefRequestHandler methods:
107107
virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
108108
CefRefPtr<CefFrame> frame,
109109
CefRefPtr<CefRequest> request,
110-
bool is_redirect) OVERRIDE;
110+
bool is_redirect) override;
111111

112112
// CefKeyboardHandler methods:
113113
virtual bool OnKeyEvent(CefRefPtr<CefBrowser> browser,
114114
const CefKeyEvent& event,
115-
CefEventHandle os_event) OVERRIDE;
115+
CefEventHandle os_event) override;
116116

117117
// CefDownloadHandler methods:
118118
virtual void OnBeforeDownload(
119119
CefRefPtr<CefBrowser> browser,
120120
CefRefPtr<CefDownloadItem> download_item,
121121
const CefString& suggested_name,
122-
CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE;
122+
CefRefPtr<CefBeforeDownloadCallback> callback) override;
123123
virtual void OnDownloadUpdated(
124124
CefRefPtr<CefBrowser> browser,
125125
CefRefPtr<CefDownloadItem> download_item,
126-
CefRefPtr<CefDownloadItemCallback> callback) OVERRIDE;
126+
CefRefPtr<CefDownloadItemCallback> callback) override;
127127

128128
private:
129129
// Include the default reference counting implementation.
@@ -135,7 +135,7 @@ class ApplicationStartupContentVisitor : public CefStringVisitor {
135135
ApplicationStartupContentVisitor(CefRefPtr<CefBrowser> cefBrowser)
136136
: cefBrowser_(cefBrowser) {
137137
}
138-
virtual void Visit(const CefString& string) OVERRIDE;
138+
virtual void Visit(const CefString& string) override;
139139
private:
140140
CefRefPtr<CefBrowser> cefBrowser_;
141141
IMPLEMENT_REFCOUNTING(ApplicationStartupContentVisitor)

cef/javascript_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class JavascriptApi : public CefV8Handler
2121
CefRefPtr<CefV8Value> object,
2222
const CefV8ValueList& arguments,
2323
CefRefPtr<CefV8Value>& retval,
24-
CefString& exception) OVERRIDE;
24+
CefString& exception) override;
2525

2626
void SetIsFullscreen(bool isFullscreen) {
2727
isFullscreen_ = isFullscreen;

0 commit comments

Comments
 (0)