chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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/browser/ui/ash/launcher/browser_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc » ('j') | chrome/common/extensions/api/icons/icons_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

index 1c36328c40020131c63ef040e30a67b53e603600..a2f442840f863ebd8aff731367969a5b3465f0a0 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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.

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

#include "chrome/browser/web_applications/web_app.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

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

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

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

#include "chrome/common/pref_names.h"

@@ -1181,7 +1182,7 @@ ash::LauncherID ChromeLauncherControllerPerApp::InsertAppLauncherItem(

ash::LauncherItem item;

item.type = controller->GetLauncherItemType();

item.is_incognito = false;

- item.image = Extension::GetDefaultIcon(true);

+ item.image = extensions::IconsInfo::GetDefaultIcon(true); // is app

WebContents* active_tab = GetLastActiveWebContents(app_id);

if (active_tab) {