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/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 switches::kExtensionsUpdateFrequency), | 402 switches::kExtensionsUpdateFrequency), |
403 &update_frequency); | 403 &update_frequency); |
404 } | 404 } |
405 updater_.reset(new ExtensionUpdater(this, | 405 updater_.reset(new ExtensionUpdater(this, |
406 extension_prefs, | 406 extension_prefs, |
407 profile->GetPrefs(), | 407 profile->GetPrefs(), |
408 profile, | 408 profile, |
409 update_frequency)); | 409 update_frequency)); |
410 } | 410 } |
411 | 411 |
412 component_loader_.reset(new extensions::ComponentLoader(this)); | 412 component_loader_.reset( |
| 413 new extensions::ComponentLoader(this, profile->GetPrefs())); |
413 | 414 |
414 app_notification_manager_->Init(); | 415 app_notification_manager_->Init(); |
415 | 416 |
416 if (extensions_enabled_) { | 417 if (extensions_enabled_) { |
417 ExternalExtensionProviderImpl::CreateExternalProviders( | 418 ExternalExtensionProviderImpl::CreateExternalProviders( |
418 this, profile_, &external_extension_providers_); | 419 this, profile_, &external_extension_providers_); |
419 } | 420 } |
420 | 421 |
421 // Use monochrome icons for Omnibox icons. | 422 // Use monochrome icons for Omnibox icons. |
422 omnibox_popup_icon_manager_.set_monochrome(true); | 423 omnibox_popup_icon_manager_.set_monochrome(true); |
(...skipping 2060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2483 | 2484 |
2484 ExtensionService::NaClModuleInfoList::iterator | 2485 ExtensionService::NaClModuleInfoList::iterator |
2485 ExtensionService::FindNaClModule(const GURL& url) { | 2486 ExtensionService::FindNaClModule(const GURL& url) { |
2486 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); | 2487 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); |
2487 iter != nacl_module_list_.end(); ++iter) { | 2488 iter != nacl_module_list_.end(); ++iter) { |
2488 if (iter->url == url) | 2489 if (iter->url == url) |
2489 return iter; | 2490 return iter; |
2490 } | 2491 } |
2491 return nacl_module_list_.end(); | 2492 return nacl_module_list_.end(); |
2492 } | 2493 } |
OLD | NEW |