diff options
| author | rockot <rockot@chromium.org> | 2015-06-01 13:53:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-01 20:54:45 +0000 |
| commit | dfbc94d1d0df5684313db14bea6183786eecac73 (patch) | |
| tree | d5082a3335e25b192c0ab98e8b39a7ea06e87460 /extensions/browser/browser_context_keyed_service_factories.cc | |
| parent | c481d6771df7cfd731ab174b561388fca8596ce1 (diff) | |
| download | chromium_src-dfbc94d1d0df5684313db14bea6183786eecac73.zip chromium_src-dfbc94d1d0df5684313db14bea6183786eecac73.tar.gz chromium_src-dfbc94d1d0df5684313db14bea6183786eecac73.tar.bz2 | |
Replace UsbDevice's unique_id with a GUID string
As we plan to standardize on GUID strings for device
instance identifiers across the device module, this
change replaces unique_id() with guid().
Lots of mostly uninteresting changes elsewhere to
accommodate this change, but the extensions USB API
did require a new service (UsbGuidMap) to map between
these GUIDs and the integer IDs its methods use.
BUG=None
R=reillyg@chromium.org
Review URL: https://codereview.chromium.org/1148893006
Cr-Commit-Position: refs/heads/master@{#332264}
Diffstat (limited to 'extensions/browser/browser_context_keyed_service_factories.cc')
| -rw-r--r-- | extensions/browser/browser_context_keyed_service_factories.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extensions/browser/browser_context_keyed_service_factories.cc b/extensions/browser/browser_context_keyed_service_factories.cc index b30339a..3eb3106 100644 --- a/extensions/browser/browser_context_keyed_service_factories.cc +++ b/extensions/browser/browser_context_keyed_service_factories.cc @@ -22,7 +22,9 @@ #include "extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.h" #include "extensions/browser/api/storage/storage_frontend.h" #include "extensions/browser/api/system_info/system_info_api.h" +#include "extensions/browser/api/usb/usb_device_resource.h" #include "extensions/browser/api/usb/usb_event_router.h" +#include "extensions/browser/api/usb/usb_guid_map.h" #include "extensions/browser/api/vpn_provider/vpn_service_factory.h" #include "extensions/browser/api/webcam_private/webcam_private_api.h" #include "extensions/browser/extension_message_filter.h" @@ -39,6 +41,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { ApiResourceManager<ResumableUDPSocket>::GetFactoryInstance(); ApiResourceManager<SerialConnection>::GetFactoryInstance(); ApiResourceManager<Socket>::GetFactoryInstance(); + ApiResourceManager<UsbDeviceResource>::GetFactoryInstance(); AudioAPI::GetFactoryInstance(); #if defined(OS_CHROMEOS) chromeos::VpnServiceFactory::GetInstance(); @@ -63,6 +66,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { StorageFrontend::GetFactoryInstance(); SystemInfoAPI::GetFactoryInstance(); UsbEventRouter::GetFactoryInstance(); + UsbGuidMap::GetFactoryInstance(); #if defined(OS_CHROMEOS) WebcamPrivateAPI::GetFactoryInstance(); #endif |