chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc - Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions.

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 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 9 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/themes/browser_theme_pack.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 dd66f0acfc820ea990e4cea821dee1be8cdd635d..f7efb587325942600de6c127186cf2d45c9b7485 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,12 +53,12 @@

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

#include "chrome/common/url_constants.h"

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

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

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

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

#include "extensions/common/url_pattern.h"

#include "grit/ash_resources.h"

#include "grit/chromium_strings.h"