chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 15239002: Move Extension and PermissionsData to extensions/common.

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

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

index adf549880de98e30533a5b0a7791ce70f7d0751b..a8caa9f21bd503e51f57bd7872a7849e7be8a647 100644

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

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

#include "chrome/common/extensions/manifest_handlers/icons_handler.h"

#include "chrome/common/pref_names.h"

@@ -70,6 +69,7 @@

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

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

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

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

#include "extensions/common/extension_resource.h"

#include "extensions/common/url_pattern.h"

#include "grit/ash_resources.h"