chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h - Issue 57103003: Merge 232631 "This CL broke the official builders."

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/common/extensions/api/managed_mode_private/managed_mode_handler.h

Issue 57103003: Merge 232631 "This CL broke the official builders." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1690/src/

Patch Set: 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/common/extensions/api/managed_mode_private/managed_mode_handler.h

===================================================================

--- chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h (revision 232654)

+++ chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h (working copy)

@@ -10,9 +10,9 @@

#include "base/files/file_path.h"

#include "base/memory/scoped_ptr.h"

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

+#include "chrome/common/extensions/manifest_handler.h"

#include "extensions/common/extension_resource.h"

#include "extensions/common/manifest.h"

-#include "extensions/common/manifest_handler.h"

namespace extensions {