chrome/browser/managed_mode/managed_user_service.cc - Issue 102103005: Move c/c/e/extension_set 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/managed_mode/managed_user_service.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years 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/managed_mode/managed_user_service.cc

diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc

index f0b8c05921e2049b1d90ad36b33ce75b6d161c6c..df89393b6088b2a49c2b705b4fae644baa4d0d46 100644

--- a/chrome/browser/managed_mode/managed_user_service.cc

+++ b/chrome/browser/managed_mode/managed_user_service.cc

@@ -34,12 +34,12 @@

#include "chrome/browser/ui/browser_list.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h"

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

#include "chrome/common/pref_names.h"

#include "components/user_prefs/pref_registry_syncable.h"

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

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

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

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

#include "google_apis/gaia/google_service_auth_error.h"

#include "grit/generated_resources.h"

#include "net/base/escape.h"