diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 05:55:32 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 05:55:32 +0000 |
| commit | c690a981436bb6a6d69ab8df959ffa5b116bf356 (patch) | |
| tree | dfb4134472778bdb6409679faec3fea2e4946633 /chrome/browser/extensions/extension_disabled_infobar_delegate.cc | |
| parent | 5d39e314de21a384eaa226d4875b6a6e8e1bea17 (diff) | |
| download | chromium_src-c690a981436bb6a6d69ab8df959ffa5b116bf356.zip chromium_src-c690a981436bb6a6d69ab8df959ffa5b116bf356.tar.gz chromium_src-c690a981436bb6a6d69ab8df959ffa5b116bf356.tar.bz2 | |
Add the right-click context menu for Browser actions and Page Actions.
BUG=29538
TEST=Right-click an extension icon and make sure all the options work for both
Page and Browser actions (Options should be grayed out when there is no Options
page specified in the manifest).
Review URL: http://codereview.chromium.org/486022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_disabled_infobar_delegate.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_disabled_infobar_delegate.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc index 54d2ed9..a1012c0 100644 --- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc +++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "chrome/browser/chrome_thread.h" -#include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_file_util.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extensions_service.h" @@ -55,7 +54,8 @@ class ExtensionDisabledDialogDelegate void Start() { // We start on the file thread so we can decode the install icon. FilePath install_icon_path = install_icon_resource_.GetFilePath(); - CrxInstaller::DecodeInstallIcon(install_icon_path, &install_icon_); + Extension::DecodeIconFromPath( + install_icon_path, Extension::EXTENSION_ICON_LARGE, &install_icon_); // Then we display the UI on the UI thread. ChromeThread::PostTask( ChromeThread::UI, FROM_HERE, |