chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.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/webui/extensions/chromeos/kiosk_apps_handler.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/webui/extensions/chromeos/kiosk_apps_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

index 8eb1838c0c8930997a165ee6306807b5a25a8282..39ae6a22b1e129d4841352e04b75879b246cbb11 100644

--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

@@ -16,12 +16,12 @@

#include "base/values.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

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

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

#include "chromeos/chromeos_switches.h"

#include "chromeos/settings/cros_settings_names.h"

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

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

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

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