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 1446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1457 ++component) { | 1457 ++component) { |
1458 if (component->type == Extension::INPUT_COMPONENT_TYPE_IME) { | 1458 if (component->type == Extension::INPUT_COMPONENT_TYPE_IME) { |
1459 ExtensionInputImeEventRouter::GetInstance()->RegisterIme( | 1459 ExtensionInputImeEventRouter::GetInstance()->RegisterIme( |
1460 profile_, extension->id(), *component); | 1460 profile_, extension->id(), *component); |
1461 } | 1461 } |
1462 #if defined(TOUCH_UI) | 1462 #if defined(TOUCH_UI) |
1463 if (component->type == Extension::INPUT_COMPONENT_TYPE_VIRTUAL_KEYBOARD && | 1463 if (component->type == Extension::INPUT_COMPONENT_TYPE_VIRTUAL_KEYBOARD && |
1464 !component->layouts.empty()) { | 1464 !component->layouts.empty()) { |
1465 const bool is_system = | 1465 const bool is_system = |
1466 !Extension::IsExternalLocation(extension->location()); | 1466 !Extension::IsExternalLocation(extension->location()); |
1467 input_method_manager->RegisterVirtualKeyboard(extension->url(), | 1467 input_method_manager->RegisterVirtualKeyboard( |
1468 component->layouts, | 1468 extension->url(), |
1469 is_system); | 1469 component->name, // human-readable name of the keyboard extension. |
| 1470 component->layouts, |
| 1471 is_system); |
1470 } | 1472 } |
1471 #endif | 1473 #endif |
1472 } | 1474 } |
1473 #endif | 1475 #endif |
1474 } | 1476 } |
1475 | 1477 |
1476 void ExtensionService::NotifyExtensionUnloaded( | 1478 void ExtensionService::NotifyExtensionUnloaded( |
1477 const Extension* extension, UnloadedExtensionInfo::Reason reason) { | 1479 const Extension* extension, UnloadedExtensionInfo::Reason reason) { |
1478 UnloadedExtensionInfo details(extension, reason); | 1480 UnloadedExtensionInfo details(extension, reason); |
1479 NotificationService::current()->Notify( | 1481 NotificationService::current()->Notify( |
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2581 | 2583 |
2582 ExtensionService::NaClModuleInfoList::iterator | 2584 ExtensionService::NaClModuleInfoList::iterator |
2583 ExtensionService::FindNaClModule(const GURL& url) { | 2585 ExtensionService::FindNaClModule(const GURL& url) { |
2584 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); | 2586 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); |
2585 iter != nacl_module_list_.end(); ++iter) { | 2587 iter != nacl_module_list_.end(); ++iter) { |
2586 if (iter->url == url) | 2588 if (iter->url == url) |
2587 return iter; | 2589 return iter; |
2588 } | 2590 } |
2589 return nacl_module_list_.end(); | 2591 return nacl_module_list_.end(); |
2590 } | 2592 } |
OLD | NEW |