OLD | NEW |
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" |
18 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
19 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
20 #include "content/browser/user_metrics.h" | 21 #include "content/browser/user_metrics.h" |
21 | 22 |
22 using content::BrowserThread; | 23 using content::BrowserThread; |
23 | 24 |
24 namespace errors = extension_manifest_errors; | 25 namespace errors = extension_manifest_errors; |
25 | 26 |
26 namespace { | 27 namespace { |
27 | 28 |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 scoped_refptr<const Extension> extension( | 135 scoped_refptr<const Extension> extension( |
135 extension_file_util::LoadExtension( | 136 extension_file_util::LoadExtension( |
136 info->extension_path, | 137 info->extension_path, |
137 info->extension_location, | 138 info->extension_location, |
138 GetCreationFlags(info), | 139 GetCreationFlags(info), |
139 &error)); | 140 &error)); |
140 | 141 |
141 if (extension.get()) { | 142 if (extension.get()) { |
142 extensions_info->at(i)->extension_manifest.reset( | 143 extensions_info->at(i)->extension_manifest.reset( |
143 static_cast<DictionaryValue*>( | 144 static_cast<DictionaryValue*>( |
144 extension->manifest_value()->DeepCopy())); | 145 extension->manifest()->value()->DeepCopy())); |
145 should_write_prefs = true; | 146 should_write_prefs = true; |
146 } | 147 } |
147 } | 148 } |
148 } | 149 } |
149 | 150 |
150 for (size_t i = 0; i < extensions_info->size(); ++i) { | 151 for (size_t i = 0; i < extensions_info->size(); ++i) { |
151 Load(*extensions_info->at(i), should_write_prefs); | 152 Load(*extensions_info->at(i), should_write_prefs); |
152 } | 153 } |
153 | 154 |
154 extension_service_->OnLoadedInstalledExtensions(); | 155 extension_service_->OnLoadedInstalledExtensions(); |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 if (extension_prefs_->AllowFileAccess(info->extension_id)) | 276 if (extension_prefs_->AllowFileAccess(info->extension_id)) |
276 flags |= Extension::ALLOW_FILE_ACCESS; | 277 flags |= Extension::ALLOW_FILE_ACCESS; |
277 if (extension_prefs_->IsFromWebStore(info->extension_id)) | 278 if (extension_prefs_->IsFromWebStore(info->extension_id)) |
278 flags |= Extension::FROM_WEBSTORE; | 279 flags |= Extension::FROM_WEBSTORE; |
279 if (extension_prefs_->IsFromBookmark(info->extension_id)) | 280 if (extension_prefs_->IsFromBookmark(info->extension_id)) |
280 flags |= Extension::FROM_BOOKMARK; | 281 flags |= Extension::FROM_BOOKMARK; |
281 return flags; | 282 return flags; |
282 } | 283 } |
283 | 284 |
284 } // namespace extensions | 285 } // namespace extensions |
OLD | NEW |