chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc - Issue 13460012: Move IconsHandler from c/c/e/api/ to c/c/e

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 13460012: Move IconsHandler from c/c/e/api/ to c/c/e (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Latest master for CQ Created 7 years, 8 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc » ('j') | no next file with comments »
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 d52cf97ee3876cde5440bbef9b52b4c7ff5c7ffd..39c70c81cdecf43b05c41c166052bf1ab4066a80 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

@@ -53,8 +53,8 @@

#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/manifest_handlers/icons_handler.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "content/public/browser/navigation_entry.h"

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

#include "ui/aura/window.h"

#include "ui/base/l10n/l10n_util.h"

using extensions::Extension;

using content::WebContents;