chrome/common/extensions/api/extension_action/script_badge_handler.cc - Issue 11786003: Move Icons out of Extension class

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/common/extensions/api/extension_action/script_badge_handler.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action

Patch Set: License year update Created 7 years, 11 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/ui/ash/launcher/browser_launcher_item_controller.cc ('K') | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/extensions/api/icons/icons_handler.h » ('j') | chrome/common/extensions/api/icons/icons_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/extension_action/script_badge_handler.cc

diff --git a/chrome/common/extensions/api/extension_action/script_badge_handler.cc b/chrome/common/extensions/api/extension_action/script_badge_handler.cc

index f68d4a883fb8d49cea4bb4a9b833b01ccb9667a7..bcde389ca24e15fd3885ad2632ba984da996207a 100644

--- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc

+++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

#include "base/memory/scoped_ptr.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

+#include "chrome/common/extensions/api/icons/icons_handler.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_manifest_constants.h"

@@ -84,7 +85,7 @@ void ScriptBadgeHandler::SetActionInfoDefaults(const Extension* extension,

info->default_title = extension->name();

info->default_icon.Clear();

for (size_t i = 0; i < extension_misc::kNumScriptBadgeIconSizes; ++i) {

- std::string path = extension->icons().Get(

+ std::string path = IconsInfo::GetIcons(extension).Get(

extension_misc::kScriptBadgeIconSizes[i],

ExtensionIconSet::MATCH_BIGGER);

if (!path.empty()) {