| OLD | NEW |
| 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 <memory> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | |
| 10 #include "base/scoped_observer.h" | 11 #include "base/scoped_observer.h" |
| 11 #include "extensions/browser/extension_icon_image.h" | 12 #include "extensions/browser/extension_icon_image.h" |
| 12 | 13 |
| 13 class ExtensionAction; | 14 class ExtensionAction; |
| 14 class ExtensionIconSet; | 15 class ExtensionIconSet; |
| 15 class Profile; | 16 class Profile; |
| 16 | 17 |
| 17 namespace extensions { | 18 namespace extensions { |
| 18 class Extension; | 19 class Extension; |
| 19 } | 20 } |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 const ExtensionAction* action_; | 59 const ExtensionAction* action_; |
| 59 Observer* observer_; | 60 Observer* observer_; |
| 60 | 61 |
| 61 ScopedObserver<extensions::IconImage, extensions::IconImage::Observer> | 62 ScopedObserver<extensions::IconImage, extensions::IconImage::Observer> |
| 62 icon_image_observer_; | 63 icon_image_observer_; |
| 63 | 64 |
| 64 DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactory); | 65 DISALLOW_COPY_AND_ASSIGN(ExtensionActionIconFactory); |
| 65 }; | 66 }; |
| 66 | 67 |
| 67 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_ | 68 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_ |
| OLD | NEW |