| 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_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_ |
| 6 #define CHROME_BROWSER_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 // CancelableRequestConsumerTSimple only takes POD keys. | 52 // CancelableRequestConsumerTSimple only takes POD keys. |
| 53 std::map<int, std::string> dom_id_map_; | 53 std::map<int, std::string> dom_id_map_; |
| 54 // A counter to track ID numbers as we use them. | 54 // A counter to track ID numbers as we use them. |
| 55 int id_; | 55 int id_; |
| 56 | 56 |
| 57 // Raw PNG representation of the favicon to show when the favicon | 57 // Raw PNG representation of the favicon to show when the favicon |
| 58 // database doesn't have a favicon for a webpage. | 58 // database doesn't have a favicon for a webpage. |
| 59 scoped_refptr<base::RefCountedMemory> default_favicon_; | 59 scoped_refptr<base::RefCountedMemory> default_favicon_; |
| 60 | 60 |
| 61 // Manage retrieval of icons from apps. | 61 // Manage retrieval of icons from apps. |
| 62 scoped_ptr<ExtensionIconColorManager> app_icon_color_manager_; | 62 std::unique_ptr<ExtensionIconColorManager> app_icon_color_manager_; |
| 63 | 63 |
| 64 DISALLOW_COPY_AND_ASSIGN(FaviconWebUIHandler); | 64 DISALLOW_COPY_AND_ASSIGN(FaviconWebUIHandler); |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 #endif // CHROME_BROWSER_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_ | 67 #endif // CHROME_BROWSER_UI_WEBUI_NTP_FAVICON_WEBUI_HANDLER_H_ |
| OLD | NEW |