diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 14:10:08 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 14:10:08 +0000 |
| commit | 9ccfaca3ed5f99a2c25ce5d28f8daca7430ba620 (patch) | |
| tree | d6ac62686ea774c79a18e8f00f72dafb9f16903f /chrome/browser/tab_contents | |
| parent | e2fa1cca45ffa1aa37e94f306b2508f78408a886 (diff) | |
| download | chromium_src-9ccfaca3ed5f99a2c25ce5d28f8daca7430ba620.zip chromium_src-9ccfaca3ed5f99a2c25ce5d28f8daca7430ba620.tar.gz chromium_src-9ccfaca3ed5f99a2c25ce5d28f8daca7430ba620.tar.bz2 | |
Convert ui::MenuModel to use gfx::Image instead of ImageSkia.
BUG=58030
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10824402
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 486413f..3ca6165 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -497,7 +497,7 @@ void RenderViewContextMenu::SetExtensionIcon(const std::string& extension_id) { DCHECK(icon.width() == gfx::kFaviconSize); DCHECK(icon.height() == gfx::kFaviconSize); - menu_model_.SetIcon(index, icon); + menu_model_.SetIcon(index, gfx::Image(icon)); } void RenderViewContextMenu::AppendAllExtensionItems() { |