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

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

Issue 8786004: Revert "Restrict extension features based on the extension type." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/installed_loader.h" 5 #include "chrome/browser/extensions/installed_loader.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/extension_prefs.h" 12 #include "chrome/browser/extensions/extension_prefs.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/extensions/extension.h" 15 #include "chrome/common/extensions/extension.h"
16 #include "chrome/common/extensions/extension_file_util.h" 16 #include "chrome/common/extensions/extension_file_util.h"
17 #include "chrome/common/extensions/extension_l10n_util.h" 17 #include "chrome/common/extensions/extension_l10n_util.h"
18 #include "chrome/common/extensions/manifest.h"
19 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
20 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
21 #include "content/browser/user_metrics.h" 20 #include "content/browser/user_metrics.h"
22 21
23 using content::BrowserThread; 22 using content::BrowserThread;
24 23
25 namespace errors = extension_manifest_errors; 24 namespace errors = extension_manifest_errors;
26 25
27 namespace { 26 namespace {
28 27
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 scoped_refptr<const Extension> extension( 134 scoped_refptr<const Extension> extension(
136 extension_file_util::LoadExtension( 135 extension_file_util::LoadExtension(
137 info->extension_path, 136 info->extension_path,
138 info->extension_location, 137 info->extension_location,
139 GetCreationFlags(info), 138 GetCreationFlags(info),
140 &error)); 139 &error));
141 140
142 if (extension.get()) { 141 if (extension.get()) {
143 extensions_info->at(i)->extension_manifest.reset( 142 extensions_info->at(i)->extension_manifest.reset(
144 static_cast<DictionaryValue*>( 143 static_cast<DictionaryValue*>(
145 extension->manifest()->value()->DeepCopy())); 144 extension->manifest_value()->DeepCopy()));
146 should_write_prefs = true; 145 should_write_prefs = true;
147 } 146 }
148 } 147 }
149 } 148 }
150 149
151 for (size_t i = 0; i < extensions_info->size(); ++i) { 150 for (size_t i = 0; i < extensions_info->size(); ++i) {
152 Load(*extensions_info->at(i), should_write_prefs); 151 Load(*extensions_info->at(i), should_write_prefs);
153 } 152 }
154 153
155 extension_service_->OnLoadedInstalledExtensions(); 154 extension_service_->OnLoadedInstalledExtensions();
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 if (extension_prefs_->AllowFileAccess(info->extension_id)) 275 if (extension_prefs_->AllowFileAccess(info->extension_id))
277 flags |= Extension::ALLOW_FILE_ACCESS; 276 flags |= Extension::ALLOW_FILE_ACCESS;
278 if (extension_prefs_->IsFromWebStore(info->extension_id)) 277 if (extension_prefs_->IsFromWebStore(info->extension_id))
279 flags |= Extension::FROM_WEBSTORE; 278 flags |= Extension::FROM_WEBSTORE;
280 if (extension_prefs_->IsFromBookmark(info->extension_id)) 279 if (extension_prefs_->IsFromBookmark(info->extension_id))
281 flags |= Extension::FROM_BOOKMARK; 280 flags |= Extension::FROM_BOOKMARK;
282 return flags; 281 return flags;
283 } 282 }
284 283
285 } // namespace extensions 284 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698