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

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

Issue 10407105: Improve error messaging of webRequest API in case of conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Store ExtensionWarnings as values in set rather than pointers Created 8 years, 3 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/extension_system.h" 5 #include "chrome/browser/extensions/extension_system.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/string_tokenizer.h" 10 #include "base/string_tokenizer.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/content_settings/cookie_settings.h" 12 #include "chrome/browser/content_settings/cookie_settings.h"
13 #include "chrome/browser/extensions/api/alarms/alarm_manager.h" 13 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
14 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h" 14 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
15 #include "chrome/browser/extensions/component_loader.h" 15 #include "chrome/browser/extensions/component_loader.h"
16 #include "chrome/browser/extensions/event_router.h" 16 #include "chrome/browser/extensions/event_router.h"
17 #include "chrome/browser/extensions/extension_devtools_manager.h" 17 #include "chrome/browser/extensions/extension_devtools_manager.h"
18 #include "chrome/browser/extensions/extension_error_reporter.h" 18 #include "chrome/browser/extensions/extension_error_reporter.h"
19 #include "chrome/browser/extensions/extension_info_map.h" 19 #include "chrome/browser/extensions/extension_info_map.h"
20 #include "chrome/browser/extensions/extension_pref_store.h" 20 #include "chrome/browser/extensions/extension_pref_store.h"
21 #include "chrome/browser/extensions/extension_pref_value_map.h" 21 #include "chrome/browser/extensions/extension_pref_value_map.h"
22 #include "chrome/browser/extensions/extension_pref_value_map_factory.h" 22 #include "chrome/browser/extensions/extension_pref_value_map_factory.h"
23 #include "chrome/browser/extensions/extension_process_manager.h" 23 #include "chrome/browser/extensions/extension_process_manager.h"
24 #include "chrome/browser/extensions/extension_service.h" 24 #include "chrome/browser/extensions/extension_service.h"
25 #include "chrome/browser/extensions/extension_system_factory.h" 25 #include "chrome/browser/extensions/extension_system_factory.h"
26 #include "chrome/browser/extensions/extension_warning_set.h"
26 #include "chrome/browser/extensions/lazy_background_task_queue.h" 27 #include "chrome/browser/extensions/lazy_background_task_queue.h"
27 #include "chrome/browser/extensions/management_policy.h" 28 #include "chrome/browser/extensions/management_policy.h"
28 #include "chrome/browser/extensions/api/messaging/message_service.h" 29 #include "chrome/browser/extensions/api/messaging/message_service.h"
29 #include "chrome/browser/extensions/navigation_observer.h" 30 #include "chrome/browser/extensions/navigation_observer.h"
30 #include "chrome/browser/extensions/shell_window_geometry_cache.h" 31 #include "chrome/browser/extensions/shell_window_geometry_cache.h"
31 #include "chrome/browser/extensions/state_store.h" 32 #include "chrome/browser/extensions/state_store.h"
32 #include "chrome/browser/extensions/unpacked_installer.h" 33 #include "chrome/browser/extensions/unpacked_installer.h"
33 #include "chrome/browser/extensions/user_script_master.h" 34 #include "chrome/browser/extensions/user_script_master.h"
34 #include "chrome/browser/prefs/pref_service.h" 35 #include "chrome/browser/prefs/pref_service.h"
35 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 287
287 serial_connection_manager_.reset(new ApiResourceManager<SerialConnection>( 288 serial_connection_manager_.reset(new ApiResourceManager<SerialConnection>(
288 BrowserThread::FILE)); 289 BrowserThread::FILE));
289 socket_manager_.reset(new ApiResourceManager<Socket>(BrowserThread::IO)); 290 socket_manager_.reset(new ApiResourceManager<Socket>(BrowserThread::IO));
290 usb_device_resource_manager_.reset( 291 usb_device_resource_manager_.reset(
291 new ApiResourceManager<UsbDeviceResource>(BrowserThread::IO)); 292 new ApiResourceManager<UsbDeviceResource>(BrowserThread::IO));
292 293
293 rules_registry_service_.reset(new RulesRegistryService(profile_)); 294 rules_registry_service_.reset(new RulesRegistryService(profile_));
294 rules_registry_service_->RegisterDefaultRulesRegistries(); 295 rules_registry_service_->RegisterDefaultRulesRegistries();
295 296
297 extension_warning_service_.reset(new ExtensionWarningService(profile_));
298
296 shared_->Init(extensions_enabled); 299 shared_->Init(extensions_enabled);
297 } 300 }
298 301
299 void ExtensionSystemImpl::InitForOTRProfile() { 302 void ExtensionSystemImpl::InitForOTRProfile() {
300 // Only initialize the RulesRegistryService of the OTR ExtensionSystem if the 303 // Only initialize the RulesRegistryService of the OTR ExtensionSystem if the
301 // regular ExtensionSystem has been initialized properly, as we depend on it. 304 // regular ExtensionSystem has been initialized properly, as we depend on it.
302 // Some ChromeOS browser tests don't initialize the regular ExtensionSystem 305 // Some ChromeOS browser tests don't initialize the regular ExtensionSystem
303 // in login-tests. 306 // in login-tests.
304 if (extension_service()) { 307 if (extension_service()) {
305 rules_registry_service_.reset(new RulesRegistryService(profile_)); 308 rules_registry_service_.reset(new RulesRegistryService(profile_));
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 371
369 ApiResourceManager<Socket>* ExtensionSystemImpl::socket_manager() { 372 ApiResourceManager<Socket>* ExtensionSystemImpl::socket_manager() {
370 return socket_manager_.get(); 373 return socket_manager_.get();
371 } 374 }
372 375
373 ApiResourceManager<UsbDeviceResource>* 376 ApiResourceManager<UsbDeviceResource>*
374 ExtensionSystemImpl::usb_device_resource_manager() { 377 ExtensionSystemImpl::usb_device_resource_manager() {
375 return usb_device_resource_manager_.get(); 378 return usb_device_resource_manager_.get();
376 } 379 }
377 380
381 ExtensionWarningService* ExtensionSystemImpl::warning_service() {
382 return extension_warning_service_.get();
383 }
384
378 void ExtensionSystemImpl::RegisterExtensionWithRequestContexts( 385 void ExtensionSystemImpl::RegisterExtensionWithRequestContexts(
379 const Extension* extension) { 386 const Extension* extension) {
380 base::Time install_time; 387 base::Time install_time;
381 if (extension->location() != Extension::COMPONENT) { 388 if (extension->location() != Extension::COMPONENT) {
382 install_time = extension_service()->extension_prefs()-> 389 install_time = extension_service()->extension_prefs()->
383 GetInstallTime(extension->id()); 390 GetInstallTime(extension->id());
384 } 391 }
385 bool incognito_enabled = 392 bool incognito_enabled =
386 extension_service()->IsIncognitoEnabled(extension->id()); 393 extension_service()->IsIncognitoEnabled(extension->id());
387 BrowserThread::PostTask( 394 BrowserThread::PostTask(
388 BrowserThread::IO, FROM_HERE, 395 BrowserThread::IO, FROM_HERE,
389 base::Bind(&ExtensionInfoMap::AddExtension, info_map(), 396 base::Bind(&ExtensionInfoMap::AddExtension, info_map(),
390 make_scoped_refptr(extension), install_time, 397 make_scoped_refptr(extension), install_time,
391 incognito_enabled)); 398 incognito_enabled));
392 } 399 }
393 400
394 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( 401 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
395 const std::string& extension_id, 402 const std::string& extension_id,
396 const extension_misc::UnloadedExtensionReason reason) { 403 const extension_misc::UnloadedExtensionReason reason) {
397 BrowserThread::PostTask( 404 BrowserThread::PostTask(
398 BrowserThread::IO, FROM_HERE, 405 BrowserThread::IO, FROM_HERE,
399 base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(), 406 base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(),
400 extension_id, reason)); 407 extension_id, reason));
401 } 408 }
402 409
403 } // namespace extensions 410 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698