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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 // Use monochrome icons for Omnibox icons. | 395 // Use monochrome icons for Omnibox icons. |
396 omnibox_popup_icon_manager_.set_monochrome(true); | 396 omnibox_popup_icon_manager_.set_monochrome(true); |
397 omnibox_icon_manager_.set_monochrome(true); | 397 omnibox_icon_manager_.set_monochrome(true); |
398 omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft, | 398 omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft, |
399 0, kOmniboxIconPaddingRight)); | 399 0, kOmniboxIconPaddingRight)); |
400 | 400 |
401 // Set this as the ExtensionService for extension sorting to ensure it | 401 // Set this as the ExtensionService for extension sorting to ensure it |
402 // cause syncs if required. | 402 // cause syncs if required. |
403 extension_prefs_->extension_sorting()->SetExtensionService(this); | 403 extension_prefs_->extension_sorting()->SetExtensionService(this); |
404 | 404 |
| 405 #if defined(ENABLE_EXTENSIONS) |
405 extension_action_storage_manager_.reset( | 406 extension_action_storage_manager_.reset( |
406 new extensions::ExtensionActionStorageManager(profile_)); | 407 new extensions::ExtensionActionStorageManager(profile_)); |
| 408 #endif |
407 | 409 |
408 // How long is the path to the Extensions directory? | 410 // How long is the path to the Extensions directory? |
409 UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions.ExtensionRootPathLength", | 411 UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions.ExtensionRootPathLength", |
410 install_directory_.value().length(), 0, 500, 100); | 412 install_directory_.value().length(), 0, 500, 100); |
411 } | 413 } |
412 | 414 |
413 const ExtensionSet* ExtensionService::extensions() const { | 415 const ExtensionSet* ExtensionService::extensions() const { |
414 return &extensions_; | 416 return &extensions_; |
415 } | 417 } |
416 | 418 |
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2550 | 2552 |
2551 ExtensionService::NaClModuleInfoList::iterator | 2553 ExtensionService::NaClModuleInfoList::iterator |
2552 ExtensionService::FindNaClModule(const GURL& url) { | 2554 ExtensionService::FindNaClModule(const GURL& url) { |
2553 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); | 2555 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); |
2554 iter != nacl_module_list_.end(); ++iter) { | 2556 iter != nacl_module_list_.end(); ++iter) { |
2555 if (iter->url == url) | 2557 if (iter->url == url) |
2556 return iter; | 2558 return iter; |
2557 } | 2559 } |
2558 return nacl_module_list_.end(); | 2560 return nacl_module_list_.end(); |
2559 } | 2561 } |
OLD | NEW |