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

Side by Side Diff: chrome/browser/extensions/requirements_checker.cc

Issue 10982037: Revert 158217 - Allow extensions which can run without NPAPI to run under Windows 8 Metro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
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/browser/extensions/requirements_checker.h" 5 #include "chrome/browser/extensions/requirements_checker.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/gpu_feature_checker.h" 9 #include "chrome/browser/gpu_feature_checker.h"
10 #include "chrome/common/extensions/extension_manifest_constants.h" 10 #include "chrome/common/extensions/extension_manifest_constants.h"
11 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
12 #include "chrome/common/extensions/manifest.h" 12 #include "chrome/common/extensions/manifest.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "content/public/common/gpu_feature_type.h" 14 #include "content/public/common/gpu_feature_type.h"
15 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 17
18 #if defined(OS_WIN)
19 #include "base/win/metro.h"
20 #endif // defined(OS_WIN)
21
22 namespace extensions { 18 namespace extensions {
23 19
24 RequirementsChecker::RequirementsChecker() 20 RequirementsChecker::RequirementsChecker()
25 : pending_requirement_checks_(0) { 21 : pending_requirement_checks_(0) {
26 } 22 }
27 23
28 RequirementsChecker::~RequirementsChecker() { 24 RequirementsChecker::~RequirementsChecker() {
29 } 25 }
30 26
31 void RequirementsChecker::Check(scoped_refptr<const Extension> extension, 27 void RequirementsChecker::Check(scoped_refptr<const Extension> extension,
32 base::Callback<void(std::vector<std::string> errors)> callback) { 28 base::Callback<void(std::vector<std::string> errors)> callback) {
33 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 29 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
34 30
35 callback_ = callback; 31 callback_ = callback;
36 const Extension::Requirements& requirements = extension->requirements(); 32 const Extension::Requirements& requirements = extension->requirements();
37 33
38 if (requirements.npapi) { 34 if (requirements.npapi) {
39 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
40 errors_.push_back( 36 errors_.push_back(
41 l10n_util::GetStringUTF8(IDS_EXTENSION_NPAPI_NOT_SUPPORTED)); 37 l10n_util::GetStringUTF8(IDS_EXTENSION_NPAPI_NOT_SUPPORTED));
42 #endif // defined(OS_CHROMEOS) 38 #endif // defined(OS_CHROMEOS)
43 #if defined(OS_WIN)
44 if (base::win::IsMetroProcess()) {
45 errors_.push_back(
46 l10n_util::GetStringUTF8(IDS_EXTENSION_NPAPI_NOT_SUPPORTED));
47 }
48 #endif // defined(OS_WIN)
49 } 39 }
50 40
51 if (requirements.webgl) { 41 if (requirements.webgl) {
52 ++pending_requirement_checks_; 42 ++pending_requirement_checks_;
53 webgl_checker_ = new GPUFeatureChecker( 43 webgl_checker_ = new GPUFeatureChecker(
54 content::GPU_FEATURE_TYPE_WEBGL, 44 content::GPU_FEATURE_TYPE_WEBGL,
55 base::Bind(&RequirementsChecker::SetWebGLAvailability, 45 base::Bind(&RequirementsChecker::SetWebGLAvailability,
56 AsWeakPtr())); 46 AsWeakPtr()));
57 } 47 }
58 48
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 if (--pending_requirement_checks_ == 0) { 89 if (--pending_requirement_checks_ == 0) {
100 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, 90 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
101 base::Bind(callback_, errors_)); 91 base::Bind(callback_, errors_));
102 // Reset the callback so any ref-counted bound parameters will get released. 92 // Reset the callback so any ref-counted bound parameters will get released.
103 callback_.Reset(); 93 callback_.Reset();
104 errors_.clear(); 94 errors_.clear();
105 } 95 }
106 } 96 }
107 97
108 } // namespace extensions 98 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/plugin_apitest.cc ('k') | chrome/common/extensions/api/extension_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698