Index: chrome/browser/extensions/extension_service.h |
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h |
index c6e40ef45ca1a2fa7090ea4264ffe581fd2cfed8..237418c70da2f4520595d3ac1f00de8384b12306 100644 |
--- a/chrome/browser/extensions/extension_service.h |
+++ b/chrome/browser/extensions/extension_service.h |
@@ -57,7 +57,6 @@ class Profile; |
class Version; |
namespace chromeos { |
-class ExtensionBluetoothEventRouter; |
class ExtensionInputMethodEventRouter; |
} |
@@ -70,6 +69,7 @@ class ContentSettingsStore; |
class CrxInstaller; |
class Extension; |
class ExtensionActionStorageManager; |
+class ExtensionBluetoothEventRouter; |
class ExtensionCookiesEventRouter; |
class ExtensionManagedModeEventRouter; |
class ExtensionSyncData; |
@@ -516,10 +516,10 @@ 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(); |
} |
@@ -851,8 +851,8 @@ 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 |