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

Side by Side Diff: content/browser/android/system_ui_resource_manager_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_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/containers/scoped_ptr_hash_map.h" 9 #include "base/containers/scoped_ptr_hash_map.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 10 matching lines...) Expand all
21 21
22 class UIResourceProvider; 22 class UIResourceProvider;
23 23
24 class CONTENT_EXPORT SystemUIResourceManagerImpl 24 class CONTENT_EXPORT SystemUIResourceManagerImpl
25 : public ui::SystemUIResourceManager { 25 : public ui::SystemUIResourceManager {
26 public: 26 public:
27 explicit SystemUIResourceManagerImpl( 27 explicit SystemUIResourceManagerImpl(
28 UIResourceProvider* ui_resource_provider); 28 UIResourceProvider* ui_resource_provider);
29 virtual ~SystemUIResourceManagerImpl(); 29 virtual ~SystemUIResourceManagerImpl();
30 30
31 virtual void PreloadResource(ResourceType type) OVERRIDE; 31 virtual void PreloadResource(ResourceType type) override;
32 virtual cc::UIResourceId GetUIResourceId(ResourceType type) OVERRIDE; 32 virtual cc::UIResourceId GetUIResourceId(ResourceType type) override;
33 33
34 private: 34 private:
35 friend class TestSystemUIResourceManagerImpl; 35 friend class TestSystemUIResourceManagerImpl;
36 class Entry; 36 class Entry;
37 37
38 // Start loading the resource bitmap. virtual for testing. 38 // Start loading the resource bitmap. virtual for testing.
39 virtual void BuildResource(ResourceType type); 39 virtual void BuildResource(ResourceType type);
40 40
41 Entry* GetEntry(ResourceType type); 41 Entry* GetEntry(ResourceType type);
42 void OnFinishedLoadBitmap(ResourceType, SkBitmap* bitmap_holder); 42 void OnFinishedLoadBitmap(ResourceType, SkBitmap* bitmap_holder);
43 43
44 scoped_ptr<Entry> resource_map_[RESOURCE_TYPE_LAST + 1]; 44 scoped_ptr<Entry> resource_map_[RESOURCE_TYPE_LAST + 1];
45 UIResourceProvider* ui_resource_provider_; 45 UIResourceProvider* ui_resource_provider_;
46 46
47 base::WeakPtrFactory<SystemUIResourceManagerImpl> weak_factory_; 47 base::WeakPtrFactory<SystemUIResourceManagerImpl> weak_factory_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(SystemUIResourceManagerImpl); 49 DISALLOW_COPY_AND_ASSIGN(SystemUIResourceManagerImpl);
50 }; 50 };
51 51
52 } // namespace content 52 } // namespace content
53 53
54 #endif // CONTENT_BROWSER_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_ 54 #endif // CONTENT_BROWSER_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698