chrome/browser/extensions/extension_icon_image.cc - Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi.

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_icon_image.cc

Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 months 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

« chrome/browser/extensions/api/extension_action/extension_actions_api.cc ('K') | « chrome/browser/extensions/extension_action_icon_factory_unittest.cc ('k') | chrome/browser/extensions/image_loading_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_icon_image.cc

diff --git a/chrome/browser/extensions/extension_icon_image.cc b/chrome/browser/extensions/extension_icon_image.cc

index dcd096815c03ab6c26653705b041539a73703acc..219cf3b8b9fd4e11b92403a3e1241083c39f89ce 100644

--- a/chrome/browser/extensions/extension_icon_image.cc

+++ b/chrome/browser/extensions/extension_icon_image.cc

@@ -128,8 +128,14 @@ void IconImage::LoadImageForScaleFactor(ui::ScaleFactor scale_factor) {

}

int id = tracker_.next_id();

+<<<<<<< HEAD

load_map_[id] = scale_factor;

+=======

+ load_map_[id].scale_factor = scale_factor;

+ load_map_[id].is_async = false;

+LOG(ERROR) << "load image";

+>>>>>>> 0b2657e... remove default icon test

std::vector<ImageLoadingTracker::ImageRepresentation> info_list;

info_list.push_back(ImageLoadingTracker::ImageRepresentation(

resource,

@@ -142,6 +148,7 @@ void IconImage::LoadImageForScaleFactor(ui::ScaleFactor scale_factor) {

void IconImage::OnImageLoaded(const gfx::Image& image,

const std::string& extension_id,

int index) {

+LOG(ERROR) << "image loaded";

LoadMap::iterator load_map_it = load_map_.find(index);

DCHECK(load_map_it != load_map_.end());