Index: chrome/browser/extensions/extension_service.h |
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h |
index 3e42906d86461e6b4c0cdf988a7d9dd3395a2da5..60759fc1f8dba987ef1cfb28c8551e982cfe62e2 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; |
@@ -515,10 +515,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(); |
} |
bryeung
2012/10/10 15:03:53
newline before #if
youngki
2012/10/10 18:34:57
Done.
|
+#if defined(OS_CHROMEOS) |
chromeos::ExtensionInputMethodEventRouter* input_method_event_router() { |
return input_method_event_router_.get(); |
} |
@@ -850,8 +850,8 @@ class ExtensionService |
scoped_ptr<extensions::ExtensionManagedModeEventRouter> |
managed_mode_event_router_; |
+ scoped_ptr<extensions::ExtensionBluetoothEventRouter> bluetooth_event_router_; |
bryeung
2012/10/10 15:03:53
newline before #if
youngki
2012/10/10 18:34:57
Done.
|
#if defined(OS_CHROMEOS) |
- scoped_ptr<chromeos::ExtensionBluetoothEventRouter> bluetooth_event_router_; |
scoped_ptr<chromeos::ExtensionInputMethodEventRouter> |
input_method_event_router_; |
#endif |