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

Side by Side Diff: chrome/browser/themes/browser_theme_pack.h

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_THEMES_BROWSER_THEME_PACK_H_ 5 #ifndef CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
6 #define CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_ 6 #define CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 static void GetThemeableImageIDRs(std::set<int>* result); 72 static void GetThemeableImageIDRs(std::set<int>* result);
73 73
74 // Builds a data pack on disk at |path| for future quick loading by 74 // Builds a data pack on disk at |path| for future quick loading by
75 // BuildFromDataPack(). Often (but not always) called from the file thread; 75 // BuildFromDataPack(). Often (but not always) called from the file thread;
76 // implementation should be threadsafe because neither thread will write to 76 // implementation should be threadsafe because neither thread will write to
77 // |image_memory_| and the worker thread will keep a reference to prevent 77 // |image_memory_| and the worker thread will keep a reference to prevent
78 // destruction. 78 // destruction.
79 bool WriteToDisk(const base::FilePath& path) const; 79 bool WriteToDisk(const base::FilePath& path) const;
80 80
81 // Overridden from CustomThemeSupplier: 81 // Overridden from CustomThemeSupplier:
82 virtual bool GetTint(int id, color_utils::HSL* hsl) const OVERRIDE; 82 virtual bool GetTint(int id, color_utils::HSL* hsl) const override;
83 virtual bool GetColor(int id, SkColor* color) const OVERRIDE; 83 virtual bool GetColor(int id, SkColor* color) const override;
84 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; 84 virtual bool GetDisplayProperty(int id, int* result) const override;
85 virtual gfx::Image GetImageNamed(int id) OVERRIDE; 85 virtual gfx::Image GetImageNamed(int id) override;
86 virtual base::RefCountedMemory* GetRawData( 86 virtual base::RefCountedMemory* GetRawData(
87 int id, ui::ScaleFactor scale_factor) const OVERRIDE; 87 int id, ui::ScaleFactor scale_factor) const override;
88 virtual bool HasCustomImage(int id) const OVERRIDE; 88 virtual bool HasCustomImage(int id) const override;
89 89
90 private: 90 private:
91 friend class BrowserThemePackTest; 91 friend class BrowserThemePackTest;
92 92
93 // Cached images. 93 // Cached images.
94 typedef std::map<int, gfx::Image> ImageCache; 94 typedef std::map<int, gfx::Image> ImageCache;
95 95
96 // The raw PNG memory associated with a certain id. 96 // The raw PNG memory associated with a certain id.
97 typedef std::map<int, scoped_refptr<base::RefCountedMemory> > RawImages; 97 typedef std::map<int, scoped_refptr<base::RefCountedMemory> > RawImages;
98 98
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 // Cache of images created in BuildFromExtension(). Once the theme pack is 268 // Cache of images created in BuildFromExtension(). Once the theme pack is
269 // created, this cache should only be accessed on the file thread. There 269 // created, this cache should only be accessed on the file thread. There
270 // should be no IDs in |image_memory_| that are in |images_on_file_thread_| 270 // should be no IDs in |image_memory_| that are in |images_on_file_thread_|
271 // or vice versa. 271 // or vice versa.
272 ImageCache images_on_file_thread_; 272 ImageCache images_on_file_thread_;
273 273
274 DISALLOW_COPY_AND_ASSIGN(BrowserThemePack); 274 DISALLOW_COPY_AND_ASSIGN(BrowserThemePack);
275 }; 275 };
276 276
277 #endif // CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_ 277 #endif // CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/web_contents_resource_provider.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698