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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
595 pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)), | 595 pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
596 install_directory_(install_directory), | 596 install_directory_(install_directory), |
597 extensions_enabled_(extensions_enabled), | 597 extensions_enabled_(extensions_enabled), |
598 show_extensions_prompts_(true), | 598 show_extensions_prompts_(true), |
599 ready_(false), | 599 ready_(false), |
600 toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), | 600 toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
601 menu_manager_(profile), | 601 menu_manager_(profile), |
602 app_notification_manager_(new AppNotificationManager(profile)), | 602 app_notification_manager_(new AppNotificationManager(profile)), |
603 permissions_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), | 603 permissions_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
604 apps_promo_(profile->GetPrefs()), | 604 apps_promo_(profile->GetPrefs()), |
605 webstore_installer_(profile), | |
606 event_routers_initialized_(false), | 605 event_routers_initialized_(false), |
607 extension_warnings_(profile) { | 606 extension_warnings_(profile) { |
608 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 607 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
609 | 608 |
610 // Figure out if extension installation should be enabled. | 609 // Figure out if extension installation should be enabled. |
611 if (command_line->HasSwitch(switches::kDisableExtensions)) { | 610 if (command_line->HasSwitch(switches::kDisableExtensions)) { |
612 extensions_enabled_ = false; | 611 extensions_enabled_ = false; |
613 } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) { | 612 } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) { |
614 extensions_enabled_ = false; | 613 extensions_enabled_ = false; |
615 } | 614 } |
(...skipping 2408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3024 | 3023 |
3025 ExtensionService::NaClModuleInfoList::iterator | 3024 ExtensionService::NaClModuleInfoList::iterator |
3026 ExtensionService::FindNaClModule(const GURL& url) { | 3025 ExtensionService::FindNaClModule(const GURL& url) { |
3027 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); | 3026 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); |
3028 iter != nacl_module_list_.end(); ++iter) { | 3027 iter != nacl_module_list_.end(); ++iter) { |
3029 if (iter->url == url) | 3028 if (iter->url == url) |
3030 return iter; | 3029 return iter; |
3031 } | 3030 } |
3032 return nacl_module_list_.end(); | 3031 return nacl_module_list_.end(); |
3033 } | 3032 } |
OLD | NEW |