chrome/browser/chromeos/app_mode/kiosk_app_data.cc - Issue 23257005: Move Feature and Manifest to top-level 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/chromeos/app_mode/kiosk_app_data.cc

Issue 23257005: Move Feature and Manifest to top-level extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 4 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:

Index: chrome/browser/chromeos/app_mode/kiosk_app_data.cc

diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc

index 9c00e9e52a9507ff91b2ce7370af0117c0345b28..acedc215b95cd78561889cfac241359d9ff30b30 100644

--- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc

+++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc

@@ -20,8 +20,8 @@

#include "chrome/browser/image_decoder.h"

#include "chrome/browser/prefs/scoped_user_pref_update.h"

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

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

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

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

#include "extensions/common/manifest_constants.h"

#include "ui/gfx/codec/png_codec.h"