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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 #include "webkit/fileapi/file_system_context.h" | 119 #include "webkit/fileapi/file_system_context.h" |
120 #include "webkit/fileapi/file_system_mount_point_provider.h" | 120 #include "webkit/fileapi/file_system_mount_point_provider.h" |
121 #endif | 121 #endif |
122 | 122 |
123 using base::Time; | 123 using base::Time; |
124 using content::BrowserContext; | 124 using content::BrowserContext; |
125 using content::BrowserThread; | 125 using content::BrowserThread; |
126 using content::DevToolsAgentHost; | 126 using content::DevToolsAgentHost; |
127 using content::DevToolsAgentHostRegistry; | 127 using content::DevToolsAgentHostRegistry; |
128 using content::PluginService; | 128 using content::PluginService; |
| 129 using extensions::CrxInstaller; |
129 using extensions::Extension; | 130 using extensions::Extension; |
130 using extensions::ExtensionIdSet; | 131 using extensions::ExtensionIdSet; |
131 using extensions::ExtensionInfo; | 132 using extensions::ExtensionInfo; |
132 using extensions::UnloadedExtensionInfo; | 133 using extensions::UnloadedExtensionInfo; |
133 using extensions::PermissionMessage; | 134 using extensions::PermissionMessage; |
134 using extensions::PermissionMessages; | 135 using extensions::PermissionMessages; |
135 using extensions::PermissionSet; | 136 using extensions::PermissionSet; |
136 | 137 |
137 namespace errors = extension_manifest_errors; | 138 namespace errors = extension_manifest_errors; |
138 | 139 |
(...skipping 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2538 | 2539 |
2539 ExtensionService::NaClModuleInfoList::iterator | 2540 ExtensionService::NaClModuleInfoList::iterator |
2540 ExtensionService::FindNaClModule(const GURL& url) { | 2541 ExtensionService::FindNaClModule(const GURL& url) { |
2541 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); | 2542 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); |
2542 iter != nacl_module_list_.end(); ++iter) { | 2543 iter != nacl_module_list_.end(); ++iter) { |
2543 if (iter->url == url) | 2544 if (iter->url == url) |
2544 return iter; | 2545 return iter; |
2545 } | 2546 } |
2546 return nacl_module_list_.end(); | 2547 return nacl_module_list_.end(); |
2547 } | 2548 } |
OLD | NEW |