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

Side by Side Diff: chrome/browser/android/thumbnail/thumbnail.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_ 5 #ifndef CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_
6 #define CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_ 6 #define CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "cc/resources/ui_resource_bitmap.h" 10 #include "cc/resources/ui_resource_bitmap.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 const gfx::SizeF& scaled_content_size() const { return scaled_content_size_; } 51 const gfx::SizeF& scaled_content_size() const { return scaled_content_size_; }
52 const gfx::SizeF& scaled_data_size() const { return scaled_data_size_; } 52 const gfx::SizeF& scaled_data_size() const { return scaled_data_size_; }
53 53
54 void SetBitmap(const SkBitmap& bitmap); 54 void SetBitmap(const SkBitmap& bitmap);
55 void SetCompressedBitmap(skia::RefPtr<SkPixelRef> compressed_bitmap, 55 void SetCompressedBitmap(skia::RefPtr<SkPixelRef> compressed_bitmap,
56 const gfx::Size& content_size); 56 const gfx::Size& content_size);
57 void CreateUIResource(); 57 void CreateUIResource();
58 58
59 // content::UIResourceClient implementation. 59 // content::UIResourceClient implementation.
60 virtual cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid, 60 virtual cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,
61 bool resource_lost) OVERRIDE; 61 bool resource_lost) override;
62 62
63 // content::UIResourceClientAndroid implementation. 63 // content::UIResourceClientAndroid implementation.
64 virtual void UIResourceIsInvalid() OVERRIDE; 64 virtual void UIResourceIsInvalid() override;
65 65
66 protected: 66 protected:
67 Thumbnail(TabId tab_id, 67 Thumbnail(TabId tab_id,
68 const base::Time& time_stamp, 68 const base::Time& time_stamp,
69 float scale, 69 float scale,
70 content::UIResourceProvider* ui_resource_provider, 70 content::UIResourceProvider* ui_resource_provider,
71 ThumbnailDelegate* thumbnail_delegate); 71 ThumbnailDelegate* thumbnail_delegate);
72 72
73 void ClearUIResourceId(); 73 void ClearUIResourceId();
74 74
75 TabId tab_id_; 75 TabId tab_id_;
76 base::Time time_stamp_; 76 base::Time time_stamp_;
77 float scale_; 77 float scale_;
78 78
79 gfx::SizeF scaled_content_size_; 79 gfx::SizeF scaled_content_size_;
80 gfx::SizeF scaled_data_size_; 80 gfx::SizeF scaled_data_size_;
81 81
82 cc::UIResourceBitmap bitmap_; 82 cc::UIResourceBitmap bitmap_;
83 cc::UIResourceId ui_resource_id_; 83 cc::UIResourceId ui_resource_id_;
84 84
85 bool retrieved_; 85 bool retrieved_;
86 86
87 content::UIResourceProvider* ui_resource_provider_; 87 content::UIResourceProvider* ui_resource_provider_;
88 ThumbnailDelegate* thumbnail_delegate_; 88 ThumbnailDelegate* thumbnail_delegate_;
89 89
90 DISALLOW_COPY_AND_ASSIGN(Thumbnail); 90 DISALLOW_COPY_AND_ASSIGN(Thumbnail);
91 }; 91 };
92 92
93 #endif // CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_ 93 #endif // CHROME_BROWSER_ANDROID_THUMBNAIL_THUMBNAIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | chrome/browser/android/thumbnail/thumbnail_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698