chrome/common/extensions/extension_process_policy.cc - Issue 102103005: Move c/c/e/extension_set to top-level extensions/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/common/extensions/extension_process_policy.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:

View unified diff | Download patch

« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/extensions/extension_set.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/common/extensions/extension_process_policy.h"	5 #include "chrome/common/extensions/extension_process_policy.h"

6	6

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

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

9 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"	8 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"

10 #include "extensions/common/extension.h"	9 #include "extensions/common/extension.h"

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

11	11

12 namespace extensions {	12 namespace extensions {

13	13

14 const extensions::Extension* GetNonBookmarkAppExtension(	14 const extensions::Extension* GetNonBookmarkAppExtension(

15 const ExtensionSet& extensions, const GURL& url) {	15 const ExtensionSet& extensions, const GURL& url) {

16 // Exclude bookmark apps, which do not use the app process model.	16 // Exclude bookmark apps, which do not use the app process model.

17 const extensions::Extension* extension =	17 const extensions::Extension* extension =

18 extensions.GetExtensionOrAppByURL(url);	18 extensions.GetExtensionOrAppByURL(url);

19 if (extension && extension->from_bookmark())	19 if (extension && extension->from_bookmark())

20 extension = NULL;	20 extension = NULL;

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 if (old_url_is_hosted_app &&	56 if (old_url_is_hosted_app &&

57 new_url_is_normal_or_hosted &&	57 new_url_is_normal_or_hosted &&

58 !either_is_web_store)	58 !either_is_web_store)

59 return false;	59 return false;

60 }	60 }

61	61

62 return old_url_extension != new_url_extension;	62 return old_url_extension != new_url_extension;

63 }	63 }

64	64

65 } // namespace extensions	65 } // namespace extensions

OLD	NEW