chrome/browser/extensions/extension_disabled_infobar_delegate.cc - Issue 501130: Revert 34858 - Merge 34812 Add the rightclick context menu for Browser actio...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_disabled_infobar_delegate.cc

Issue 501130: Revert 34858 - Merge 34812 Add the rightclick context menu for Browser actio... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/

Patch Set: Created 11 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_action_context_menu_model.cc ('k') | chrome/browser/extensions/extensions_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_disabled_infobar_delegate.cc

===================================================================

--- chrome/browser/extensions/extension_disabled_infobar_delegate.cc (revision 35006)

+++ chrome/browser/extensions/extension_disabled_infobar_delegate.cc (working copy)

@@ -6,6 +6,7 @@

#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"

@@ -54,8 +55,7 @@

void Start() {

// We start on the file thread so we can decode the install icon.

FilePath install_icon_path = install_icon_resource_.GetFilePath();

- Extension::DecodeIconFromPath(

- install_icon_path, Extension::EXTENSION_ICON_LARGE, &install_icon_);

+ CrxInstaller::DecodeInstallIcon(install_icon_path, &install_icon_);

// Then we display the UI on the UI thread.

ChromeThread::PostTask(

ChromeThread::UI, FROM_HERE,

« no previous file with comments | « chrome/browser/extensions/extension_action_context_menu_model.cc ('k') | chrome/browser/extensions/extensions_ui.cc » ('j') | no next file with comments »