chrome/browser/chromeos/login/kiosk_browsertest.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/chromeos/login/kiosk_browsertest.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/chromeos/login/kiosk_browsertest.cc

diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc

index 1070b4a033107b205e6e8a0813e10ae77da439fa..fd118815b006a17c0030b155b877e05622d0397e 100644

--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc

+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -48,7 +48,6 @@

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/pref_names.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "chrome/test/base/interactive_test_utils.h"

@@ -60,6 +59,7 @@

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

#include "content/public/test/browser_test_utils.h"

#include "content/public/test/test_utils.h"

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

#include "google_apis/gaia/fake_gaia.h"

#include "google_apis/gaia/gaia_switches.h"

#include "net/base/network_change_notifier.h"