chrome/browser/ui/views/apps/chrome_native_app_window_views.cc - Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/apps/chrome_native_app_window_views.h ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

index 519c53cecbd6f5eee03706864601c83dd769737e..71d3f37827be0a7db40cf2e376bf43964e2ce146 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

@@ -150,7 +150,7 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,

private:

// Overridden from ash::wm::WindowStateDelegate.

- virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE {

+ virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) override {

// Windows which cannot be maximized should not be fullscreened.

DCHECK(window_state->IsFullscreen() || window_state->CanMaximize());

if (window_state->IsFullscreen())

@@ -163,7 +163,7 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,

// Overridden from ash::wm::WindowStateObserver:

virtual void OnPostWindowStateTypeChange(

ash::wm::WindowState* window_state,

- ash::wm::WindowStateType old_type) OVERRIDE {

+ ash::wm::WindowStateType old_type) override {

// Since the window state might get set by a window manager, it is possible

// to come here before the application set its |BaseWindow|.

if (!window_state->IsFullscreen() && !window_state->IsMinimized() &&

@@ -179,7 +179,7 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,

}

// Overridden from aura::WindowObserver:

- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {

+ virtual void OnWindowDestroying(aura::Window* window) override {

window_state_->RemoveObserver(this);

window_state_->window()->RemoveObserver(this);

window_state_ = NULL;