content/browser/android/system_ui_resource_manager_impl.cc - Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android

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: content/browser/android/system_ui_resource_manager_impl.cc

Issue 629183002: Replacing the OVERRIDE with override and FINAL with final in content/browser/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolving Error in android 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 | « content/browser/android/system_ui_resource_manager_impl.h ('k') | content/browser/android/system_ui_resource_manager_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/system_ui_resource_manager_impl.cc

diff --git a/content/browser/android/system_ui_resource_manager_impl.cc b/content/browser/android/system_ui_resource_manager_impl.cc

index b438d9c0ce5ed09f3c5737f3768f6ddc78519d76..28628577bdb264310af82ad5b636b88df2a2750d 100644

--- a/content/browser/android/system_ui_resource_manager_impl.cc

+++ b/content/browser/android/system_ui_resource_manager_impl.cc

@@ -104,13 +104,13 @@ class SystemUIResourceManagerImpl::Entry

// content::UIResourceClient implementation.

virtual cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,

- bool resource_lost) OVERRIDE {

+ bool resource_lost) override {

DCHECK(!bitmap_.empty());

return cc::UIResourceBitmap(bitmap_);

}

// content::UIResourceClientAndroid implementation.

- virtual void UIResourceIsInvalid() OVERRIDE { id_ = 0; }

+ virtual void UIResourceIsInvalid() override { id_ = 0; }

const SkBitmap& bitmap() const { return bitmap_; }