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

Side by Side Diff: chrome/browser/extensions/extension_action_icon_factory.h

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "extensions/browser/extension_icon_image.h" 9 #include "extensions/browser/extension_icon_image.h"
10 10
(...skipping 21 matching lines...) Expand all
32 32
33 // Observer should outlive this. 33 // Observer should outlive this.
34 ExtensionActionIconFactory(Profile* profile, 34 ExtensionActionIconFactory(Profile* profile,
35 const extensions::Extension* extension, 35 const extensions::Extension* extension,
36 const ExtensionAction* action, 36 const ExtensionAction* action,
37 Observer* observer); 37 Observer* observer);
38 virtual ~ExtensionActionIconFactory(); 38 virtual ~ExtensionActionIconFactory();
39 39
40 // extensions::IconImage override. 40 // extensions::IconImage override.
41 virtual void OnExtensionIconImageChanged( 41 virtual void OnExtensionIconImageChanged(
42 extensions::IconImage* image) OVERRIDE; 42 extensions::IconImage* image) override;
43 43
44 // Gets the extension action icon for the tab. 44 // Gets the extension action icon for the tab.
45 // If there is an icon set using |SetIcon|, that icon is returned. 45 // If there is an icon set using |SetIcon|, that icon is returned.
46 // Else, if there is a default icon set for the extension action, the icon is 46 // Else, if there is a default icon set for the extension action, the icon is
47 // created using IconImage. Observer is triggered wheniever the icon gets 47 // created using IconImage. Observer is triggered wheniever the icon gets
48 // updated. 48 // updated.
49 // Else, extension favicon is returned. 49 // Else, extension favicon is returned.
50 // In all cases, action's attention and animation icon transformations are 50 // In all cases, action's attention and animation icon transformations are
51 // applied on the icon. 51 // applied on the icon.
52 gfx::Image GetIcon(int tab_id); 52 gfx::Image GetIcon(int tab_id);
53 53
54 private: 54 private:
55 // Gets the icon that should be returned by |GetIcon| (without the attention 55 // Gets the icon that should be returned by |GetIcon| (without the attention
56 // and animation transformations). 56 // and animation transformations).
57 gfx::ImageSkia GetBaseIconFromAction(int tab_id); 57 gfx::ImageSkia GetBaseIconFromAction(int tab_id);
58 58
59 const extensions::Extension* extension_; 59 const extensions::Extension* extension_;
60 const ExtensionAction* action_; 60 const ExtensionAction* action_;
61 Observer* observer_; 61 Observer* observer_;
62 // Underlying icon image for the default icon. 62 // Underlying icon image for the default icon.
63 scoped_ptr<extensions::IconImage> default_icon_; 63 scoped_ptr<extensions::IconImage> default_icon_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactory); 65 DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactory);
66 }; 66 };
67 67
68 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_ 68 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_action.cc ('k') | chrome/browser/extensions/extension_action_icon_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698