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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index ef202011c16004e50f2f6afee24afcbf6ad48f4d..dbb93e23d56a84bfa5f615c7182c452844fad08c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -165,6 +165,7 @@ using content::SiteInstance;
using content::WebContents;
using extensions::APIPermission;
using extensions::Extension;
+using extensions::Manifest;
using webkit_glue::WebPreferences;
namespace {
@@ -795,7 +796,7 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
// permission, or that does not allow JavaScript access to the background
// page, we want to give each instance its own process to improve
// responsiveness.
- if (extension->GetType() == Extension::TYPE_HOSTED_APP) {
+ if (extension->GetType() == Manifest::TYPE_HOSTED_APP) {
if (!extension->HasAPIPermission(APIPermission::kBackground) ||
!extension->allow_background_js_access()) {
return false;
@@ -1919,8 +1920,8 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI(
if (allowed_list == "*") {
// The wildcard allows socket API only for packaged and platform apps.
return extension &&
- (extension->GetType() == Extension::TYPE_LEGACY_PACKAGED_APP ||
- extension->GetType() == Extension::TYPE_PLATFORM_APP);
+ (extension->GetType() == Manifest::TYPE_LEGACY_PACKAGED_APP ||
+ extension->GetType() == Manifest::TYPE_PLATFORM_APP);
} else if (!allowed_list.empty()) {
StringTokenizer t(allowed_list, ",");
while (t.GetNext()) {

Powered by Google App Engine
This is Rietveld 408576698