Chromium Code Reviews| 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 #include "chrome/browser/extensions/extension_action.h" | 5 #include "chrome/browser/extensions/extension_action.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 #include "ui/base/resource/resource_bundle.h" | 28 #include "ui/base/resource/resource_bundle.h" |
| 29 #include "ui/gfx/animation/animation_delegate.h" | 29 #include "ui/gfx/animation/animation_delegate.h" |
| 30 #include "ui/gfx/canvas.h" | 30 #include "ui/gfx/canvas.h" |
| 31 #include "ui/gfx/color_utils.h" | 31 #include "ui/gfx/color_utils.h" |
| 32 #include "ui/gfx/geometry/rect.h" | 32 #include "ui/gfx/geometry/rect.h" |
| 33 #include "ui/gfx/geometry/size.h" | 33 #include "ui/gfx/geometry/size.h" |
| 34 #include "ui/gfx/image/image.h" | 34 #include "ui/gfx/image/image.h" |
| 35 #include "ui/gfx/image/image_skia.h" | 35 #include "ui/gfx/image/image_skia.h" |
| 36 #include "ui/gfx/image/image_skia_source.h" | 36 #include "ui/gfx/image/image_skia_source.h" |
| 37 #include "ui/gfx/ipc/gfx_param_traits.h" | 37 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 38 #include "ui/gfx/ipc/gfx_skia_param_traits.h" | |
|
Devlin
2016/03/28 21:01:51
ditto
Mark Dittmer
2016/03/29 17:41:24
This file needs IPC::ParamTraits<SkBitmap>.
Mark Dittmer
2016/03/30 22:04:41
Removed unnecessary non-skia include.
| |
| 38 #include "ui/gfx/skbitmap_operations.h" | 39 #include "ui/gfx/skbitmap_operations.h" |
| 39 #include "url/gurl.h" | 40 #include "url/gurl.h" |
| 40 | 41 |
| 41 namespace { | 42 namespace { |
| 42 | 43 |
| 43 // Returns the default icon image for extensions. | 44 // Returns the default icon image for extensions. |
| 44 gfx::Image GetDefaultIcon() { | 45 gfx::Image GetDefaultIcon() { |
| 45 return ui::ResourceBundle::GetSharedInstance().GetImageNamed( | 46 return ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| 46 IDR_EXTENSIONS_FAVICON); | 47 IDR_EXTENSIONS_FAVICON); |
| 47 } | 48 } |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 326 // If there is a default icon, the icon width will be set depending on our | 327 // If there is a default icon, the icon width will be set depending on our |
| 327 // action type. | 328 // action type. |
| 328 if (default_icon_) | 329 if (default_icon_) |
| 329 return ActionIconSize(); | 330 return ActionIconSize(); |
| 330 | 331 |
| 331 // If no icon has been set and there is no default icon, we need favicon | 332 // If no icon has been set and there is no default icon, we need favicon |
| 332 // width. | 333 // width. |
| 333 return ui::ResourceBundle::GetSharedInstance().GetImageNamed( | 334 return ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| 334 IDR_EXTENSIONS_FAVICON).Width(); | 335 IDR_EXTENSIONS_FAVICON).Width(); |
| 335 } | 336 } |
| OLD | NEW |