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/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/bind.h" | 10 #include "base/bind.h" |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 | 222 |
223 } // namespace | 223 } // namespace |
224 | 224 |
225 bool ExtensionService::ComponentExtensionInfo::Equals( | 225 bool ExtensionService::ComponentExtensionInfo::Equals( |
226 const ComponentExtensionInfo& other) const { | 226 const ComponentExtensionInfo& other) const { |
227 return other.manifest == manifest && other.root_directory == root_directory; | 227 return other.manifest == manifest && other.root_directory == root_directory; |
228 } | 228 } |
229 | 229 |
230 ExtensionService::ExtensionRuntimeData::ExtensionRuntimeData() | 230 ExtensionService::ExtensionRuntimeData::ExtensionRuntimeData() |
231 : background_page_ready(false), | 231 : background_page_ready(false), |
232 being_upgraded(false) { | 232 being_upgraded(false), |
| 233 has_used_webrequest(false) { |
233 } | 234 } |
234 | 235 |
235 ExtensionService::ExtensionRuntimeData::~ExtensionRuntimeData() { | 236 ExtensionService::ExtensionRuntimeData::~ExtensionRuntimeData() { |
236 } | 237 } |
237 | 238 |
238 ExtensionService::NaClModuleInfo::NaClModuleInfo() { | 239 ExtensionService::NaClModuleInfo::NaClModuleInfo() { |
239 } | 240 } |
240 | 241 |
241 ExtensionService::NaClModuleInfo::~NaClModuleInfo() { | 242 ExtensionService::NaClModuleInfo::~NaClModuleInfo() { |
242 } | 243 } |
(...skipping 2781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3024 | 3025 |
3025 ExtensionService::NaClModuleInfoList::iterator | 3026 ExtensionService::NaClModuleInfoList::iterator |
3026 ExtensionService::FindNaClModule(const GURL& url) { | 3027 ExtensionService::FindNaClModule(const GURL& url) { |
3027 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); | 3028 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); |
3028 iter != nacl_module_list_.end(); ++iter) { | 3029 iter != nacl_module_list_.end(); ++iter) { |
3029 if (iter->url == url) | 3030 if (iter->url == url) |
3030 return iter; | 3031 return iter; |
3031 } | 3032 } |
3032 return nacl_module_list_.end(); | 3033 return nacl_module_list_.end(); |
3033 } | 3034 } |
OLD | NEW |