Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_
7 7
8 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
9 #include "content/browser/android/system_ui_resource_manager_impl.h" 9 #include "content/browser/android/system_ui_resource_manager_impl.h"
10 #include "content/public/browser/android/ui_resource_provider.h" 10 #include "content/public/browser/android/ui_resource_provider.h"
(...skipping 10 matching lines...) Expand all
21 public: 21 public:
22 UIResourceProviderImpl(); 22 UIResourceProviderImpl();
23 23
24 virtual ~UIResourceProviderImpl(); 24 virtual ~UIResourceProviderImpl();
25 25
26 void SetLayerTreeHost(cc::LayerTreeHost* host); 26 void SetLayerTreeHost(cc::LayerTreeHost* host);
27 27
28 void UIResourcesAreInvalid(); 28 void UIResourcesAreInvalid();
29 29
30 virtual cc::UIResourceId CreateUIResource( 30 virtual cc::UIResourceId CreateUIResource(
31 UIResourceClientAndroid* client) OVERRIDE; 31 UIResourceClientAndroid* client) override;
32 32
33 virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE; 33 virtual void DeleteUIResource(cc::UIResourceId resource_id) override;
34 34
35 ui::SystemUIResourceManager& GetSystemUIResourceManager(); 35 ui::SystemUIResourceManager& GetSystemUIResourceManager();
36 36
37 void SetSupportsETC1NonPowerOfTwo(bool supports_etc1_npot) { 37 void SetSupportsETC1NonPowerOfTwo(bool supports_etc1_npot) {
38 supports_etc1_npot_ = supports_etc1_npot; 38 supports_etc1_npot_ = supports_etc1_npot;
39 } 39 }
40 virtual bool SupportsETC1NonPowerOfTwo() const OVERRIDE; 40 virtual bool SupportsETC1NonPowerOfTwo() const override;
41 41
42 private: 42 private:
43 typedef base::hash_map<cc::UIResourceId, UIResourceClientAndroid*> 43 typedef base::hash_map<cc::UIResourceId, UIResourceClientAndroid*>
44 UIResourceClientMap; 44 UIResourceClientMap;
45 UIResourceClientMap ui_resource_client_map_; 45 UIResourceClientMap ui_resource_client_map_;
46 SystemUIResourceManagerImpl system_ui_resource_manager_; 46 SystemUIResourceManagerImpl system_ui_resource_manager_;
47 cc::LayerTreeHost* host_; 47 cc::LayerTreeHost* host_;
48 bool supports_etc1_npot_; 48 bool supports_etc1_npot_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(UIResourceProviderImpl); 50 DISALLOW_COPY_AND_ASSIGN(UIResourceProviderImpl);
51 }; 51 };
52 52
53 } // namespace content 53 } // namespace content
54 54
55 #endif // CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_ 55 #endif // CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698