| OLD | NEW | 
|---|
| 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_service.h" | 5 #include "chrome/browser/extensions/extension_service.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <set> | 8 #include <set> | 
| 9 | 9 | 
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" | 
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 113 #include "chrome/browser/extensions/extension_input_ime_api.h" | 113 #include "chrome/browser/extensions/extension_input_ime_api.h" | 
| 114 #include "webkit/fileapi/file_system_context.h" | 114 #include "webkit/fileapi/file_system_context.h" | 
| 115 #include "webkit/fileapi/file_system_mount_point_provider.h" | 115 #include "webkit/fileapi/file_system_mount_point_provider.h" | 
| 116 #endif | 116 #endif | 
| 117 | 117 | 
| 118 #if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD) | 118 #if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD) | 
| 119 #include "chrome/browser/extensions/extension_input_ui_api.h" | 119 #include "chrome/browser/extensions/extension_input_ui_api.h" | 
| 120 #endif | 120 #endif | 
| 121 | 121 | 
| 122 using base::Time; | 122 using base::Time; | 
|  | 123 using content::BrowserContext; | 
| 123 using content::BrowserThread; | 124 using content::BrowserThread; | 
| 124 using content::DevToolsAgentHost; | 125 using content::DevToolsAgentHost; | 
| 125 using content::DevToolsAgentHostRegistry; | 126 using content::DevToolsAgentHostRegistry; | 
| 126 using content::PluginService; | 127 using content::PluginService; | 
| 127 | 128 | 
| 128 namespace errors = extension_manifest_errors; | 129 namespace errors = extension_manifest_errors; | 
| 129 | 130 | 
| 130 namespace { | 131 namespace { | 
| 131 | 132 | 
| 132 #if defined(OS_LINUX) | 133 #if defined(OS_LINUX) | 
| (...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1129 | 1130 | 
| 1130   profile_->UnregisterExtensionWithRequestContexts(extension->id(), reason); | 1131   profile_->UnregisterExtensionWithRequestContexts(extension->id(), reason); | 
| 1131   profile_->GetExtensionSpecialStoragePolicy()-> | 1132   profile_->GetExtensionSpecialStoragePolicy()-> | 
| 1132       RevokeRightsForExtension(extension); | 1133       RevokeRightsForExtension(extension); | 
| 1133 | 1134 | 
| 1134   ExtensionWebUI::UnregisterChromeURLOverrides( | 1135   ExtensionWebUI::UnregisterChromeURLOverrides( | 
| 1135       profile_, extension->GetChromeURLOverrides()); | 1136       profile_, extension->GetChromeURLOverrides()); | 
| 1136 | 1137 | 
| 1137 #if defined(OS_CHROMEOS) | 1138 #if defined(OS_CHROMEOS) | 
| 1138     // Revoke external file access to | 1139     // Revoke external file access to | 
| 1139   if (profile_->GetFileSystemContext() && | 1140   if (BrowserContext::GetFileSystemContext(profile_) && | 
| 1140       profile_->GetFileSystemContext()->external_provider()) { | 1141       BrowserContext::GetFileSystemContext(profile_)->external_provider()) { | 
| 1141     profile_->GetFileSystemContext()->external_provider()-> | 1142     BrowserContext::GetFileSystemContext(profile_)->external_provider()-> | 
| 1142         RevokeAccessForExtension(extension->id()); | 1143         RevokeAccessForExtension(extension->id()); | 
| 1143   } | 1144   } | 
| 1144 | 1145 | 
| 1145   if (extension->input_components().size() > 0) { | 1146   if (extension->input_components().size() > 0) { | 
| 1146     ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes( | 1147     ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes( | 
| 1147         profile_, extension->id()); | 1148         profile_, extension->id()); | 
| 1148   } | 1149   } | 
| 1149 #endif | 1150 #endif | 
| 1150 | 1151 | 
| 1151   UpdateActiveExtensionsInCrashReporter(); | 1152   UpdateActiveExtensionsInCrashReporter(); | 
| (...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2659   return api_resource_controller_; | 2660   return api_resource_controller_; | 
| 2660 } | 2661 } | 
| 2661 | 2662 | 
| 2662 extensions::RulesRegistryService* ExtensionService::GetRulesRegistryService() { | 2663 extensions::RulesRegistryService* ExtensionService::GetRulesRegistryService() { | 
| 2663   if (!rules_registry_service_.get()) { | 2664   if (!rules_registry_service_.get()) { | 
| 2664     rules_registry_service_.reset( | 2665     rules_registry_service_.reset( | 
| 2665         new extensions::RulesRegistryService(profile_)); | 2666         new extensions::RulesRegistryService(profile_)); | 
| 2666   } | 2667   } | 
| 2667   return rules_registry_service_.get(); | 2668   return rules_registry_service_.get(); | 
| 2668 } | 2669 } | 
| OLD | NEW | 
|---|