| Index: chrome/browser/extensions/extension_service.h
|
| diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
|
| index 29693d3f5a1af1b73eaaa97200199a055520ccea..9bc16643a316b0e19a2bad91997ea88e3ed6d3cc 100644
|
| --- a/chrome/browser/extensions/extension_service.h
|
| +++ b/chrome/browser/extensions/extension_service.h
|
| @@ -56,7 +56,6 @@ class Profile;
|
| class Version;
|
|
|
| namespace chromeos {
|
| -class ExtensionBluetoothEventRouter;
|
| class ExtensionInputMethodEventRouter;
|
| }
|
|
|
| @@ -69,6 +68,7 @@ class ContentSettingsStore;
|
| class CrxInstaller;
|
| class Extension;
|
| class ExtensionActionStorageManager;
|
| +class ExtensionBluetoothEventRouter;
|
| class ExtensionCookiesEventRouter;
|
| class ExtensionManagedModeEventRouter;
|
| class ExtensionSyncData;
|
| @@ -519,10 +519,11 @@ class ExtensionService
|
| return window_event_router_.get();
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| - chromeos::ExtensionBluetoothEventRouter* bluetooth_event_router() {
|
| + extensions::ExtensionBluetoothEventRouter* bluetooth_event_router() {
|
| return bluetooth_event_router_.get();
|
| }
|
| +
|
| +#if defined(OS_CHROMEOS)
|
| chromeos::ExtensionInputMethodEventRouter* input_method_event_router() {
|
| return input_method_event_router_.get();
|
| }
|
| @@ -861,8 +862,9 @@ class ExtensionService
|
| scoped_ptr<extensions::ExtensionManagedModeEventRouter>
|
| managed_mode_event_router_;
|
|
|
| + scoped_ptr<extensions::ExtensionBluetoothEventRouter> bluetooth_event_router_;
|
| +
|
| #if defined(OS_CHROMEOS)
|
| - scoped_ptr<chromeos::ExtensionBluetoothEventRouter> bluetooth_event_router_;
|
| scoped_ptr<chromeos::ExtensionInputMethodEventRouter>
|
| input_method_event_router_;
|
| #endif
|
|
|