content/browser/android/ui_resource_provider_impl.h - 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/ui_resource_provider_impl.h

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_unittest.cc ('k') | content/browser/android/web_contents_observer_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/ui_resource_provider_impl.h

diff --git a/content/browser/android/ui_resource_provider_impl.h b/content/browser/android/ui_resource_provider_impl.h

index 06affe8b47d6836f3f75cb53ecd5cf4335a0cd1e..1c29a3ed11731d0de2f6af36f996ee04eaaaeb38 100644

--- a/content/browser/android/ui_resource_provider_impl.h

+++ b/content/browser/android/ui_resource_provider_impl.h

@@ -28,16 +28,16 @@ class UIResourceProviderImpl : public UIResourceProvider {

void UIResourcesAreInvalid();

virtual cc::UIResourceId CreateUIResource(

- UIResourceClientAndroid* client) OVERRIDE;

+ UIResourceClientAndroid* client) override;

- virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;

+ virtual void DeleteUIResource(cc::UIResourceId resource_id) override;

ui::SystemUIResourceManager& GetSystemUIResourceManager();

void SetSupportsETC1NonPowerOfTwo(bool supports_etc1_npot) {

supports_etc1_npot_ = supports_etc1_npot;

}

- virtual bool SupportsETC1NonPowerOfTwo() const OVERRIDE;

+ virtual bool SupportsETC1NonPowerOfTwo() const override;

private:

typedef base::hash_map<cc::UIResourceId, UIResourceClientAndroid*>