| Index: chrome/browser/extensions/extension_context_menu_model.cc
|
| diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
|
| index f80437d88fa27d7a3d4ce51219360a047dadb985..a646900134827f6fc827b8c995a2454d401f169d 100644
|
| --- a/chrome/browser/extensions/extension_context_menu_model.cc
|
| +++ b/chrome/browser/extensions/extension_context_menu_model.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/extensions/extension_context_menu_model.h"
|
|
|
| #include "base/utf_string_conversions.h"
|
| +#include "chrome/browser/extensions/extension_action.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/extensions/extension_tab_util.h"
|
| @@ -14,7 +15,6 @@
|
| #include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/chrome_pages.h"
|
| #include "chrome/common/extensions/extension.h"
|
| -#include "chrome/common/extensions/extension_action.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -159,9 +159,9 @@ ExtensionContextMenuModel::~ExtensionContextMenuModel() {}
|
| void ExtensionContextMenuModel::InitMenu(const Extension* extension) {
|
| DCHECK(extension);
|
|
|
| - extension_action_ = extension->browser_action();
|
| + extension_action_ = extensions::GetBrowserAction(profile_, *extension);
|
| if (!extension_action_)
|
| - extension_action_ = extension->page_action();
|
| + extension_action_ = extensions::GetPageAction(profile_, *extension);
|
|
|
| AddItem(NAME, UTF8ToUTF16(extension->name()));
|
| AddSeparator(ui::NORMAL_SEPARATOR);
|
|
|