Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Side by Side Diff: chrome/common/extensions/extension_process_policy.cc

Issue 1212373004: Move AppIsolationInfo from chrome to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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:
View unified diff | Download patch
OLDNEW
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/manifest_handlers/app_isolation_info.h"
9 #include "extensions/common/constants.h" 8 #include "extensions/common/constants.h"
10 #include "extensions/common/extension.h" 9 #include "extensions/common/extension.h"
11 #include "extensions/common/extension_set.h" 10 #include "extensions/common/extension_set.h"
11 #include "extensions/common/manifest_handlers/app_isolation_info.h"
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 const extensions::Extension* GetNonBookmarkAppExtension( 15 const extensions::Extension* GetNonBookmarkAppExtension(
16 const ExtensionSet& extensions, const GURL& url) { 16 const ExtensionSet& extensions, const GURL& url) {
17 // Exclude bookmark apps, which do not use the app process model. 17 // Exclude bookmark apps, which do not use the app process model.
18 const extensions::Extension* extension = 18 const extensions::Extension* extension =
19 extensions.GetExtensionOrAppByURL(url); 19 extensions.GetExtensionOrAppByURL(url);
20 if (extension && extension->from_bookmark()) 20 if (extension && extension->from_bookmark())
21 extension = NULL; 21 extension = NULL;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 if (old_url_is_hosted_app && 57 if (old_url_is_hosted_app &&
58 new_url_is_normal_or_hosted && 58 new_url_is_normal_or_hosted &&
59 !either_is_web_store) 59 !either_is_web_store)
60 return false; 60 return false;
61 } 61 }
62 62
63 return old_url_extension != new_url_extension; 63 return old_url_extension != new_url_extension;
64 } 64 }
65 65
66 } // namespace extensions 66 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/chrome_manifest_handlers.cc ('k') | chrome/common/extensions/manifest_handlers/app_isolation_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698