| 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/ui/views/action_box_menu.h" | 5 #include "chrome/browser/ui/views/action_box_menu.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_icon_image.h" | 7 #include "chrome/browser/extensions/extension_icon_image.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/toolbar/action_box_menu_model.h" | 9 #include "chrome/browser/ui/toolbar/action_box_menu_model.h" |
| 10 #include "chrome/browser/ui/views/action_box_context_menu.h" | 10 #include "chrome/browser/ui/views/action_box_context_menu.h" |
| 11 #include "chrome/common/extensions/api/extension_action/action_info.h" | 11 #include "chrome/common/extensions/api/extension_action/action_info.h" |
| 12 #include "chrome/common/extensions/api/icons/icons_handler.h" | |
| 13 #include "chrome/common/extensions/extension.h" | 12 #include "chrome/common/extensions/extension.h" |
| 14 #include "chrome/common/extensions/extension_constants.h" | 13 #include "chrome/common/extensions/extension_constants.h" |
| 14 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" |
| 15 #include "ui/views/controls/button/menu_button.h" | 15 #include "ui/views/controls/button/menu_button.h" |
| 16 #include "ui/views/controls/image_view.h" | 16 #include "ui/views/controls/image_view.h" |
| 17 #include "ui/views/controls/menu/menu_runner.h" | 17 #include "ui/views/controls/menu/menu_runner.h" |
| 18 #include "ui/views/view.h" | 18 #include "ui/views/view.h" |
| 19 | 19 |
| 20 using extensions::ActionInfo; | 20 using extensions::ActionInfo; |
| 21 using extensions::Extension; | 21 using extensions::Extension; |
| 22 using extensions::IconImage; | 22 using extensions::IconImage; |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 if (model_->IsItemExtension(model_index)) { | 118 if (model_->IsItemExtension(model_index)) { |
| 119 const Extension* extension = model_->GetExtensionAt(model_index); | 119 const Extension* extension = model_->GetExtensionAt(model_index); |
| 120 ExtensionImageView* view = new ExtensionImageView(browser_->profile(), | 120 ExtensionImageView* view = new ExtensionImageView(browser_->profile(), |
| 121 extension); | 121 extension); |
| 122 // |menu_item| will own the |view| from now on. | 122 // |menu_item| will own the |view| from now on. |
| 123 menu_item->SetIconView(view); | 123 menu_item->SetIconView(view); |
| 124 } | 124 } |
| 125 } | 125 } |
| 126 } | 126 } |
| 127 } | 127 } |
| OLD | NEW |