Moved bluetooth adapter files to device/bluetooth/.

chrome/browser/extensions/extension_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 38 matching lines @@
 class ExtensionFontSettingsEventRouter;
 class ExtensionManagementEventRouter;
 class ExtensionSyncData;
 class ExtensionToolbarModel;
 class HistoryExtensionEventRouter;
 class GURL;
 class Profile;
 class Version;
 
 namespace chromeos {
-class ExtensionBluetoothEventRouter;
 class ExtensionInputMethodEventRouter;
 }
 
 namespace extensions {
 class AppNotificationManager;
 class AppSyncData;
 class BrowserEventRouter;
 class ComponentLoader;
 class ContentSettingsStore;
 class CrxInstaller;
 class Extension;
 class ExtensionActionStorageManager;
+class ExtensionBluetoothEventRouter;
 class ExtensionCookiesEventRouter;
 class ExtensionManagedModeEventRouter;
 class ExtensionSyncData;
 class ExtensionSystem;
 class ExtensionUpdater;
 class FontSettingsEventRouter;
 class MediaGalleriesPrivateEventRouter;
 class PendingExtensionManager;
 class PreferenceEventRouter;
 class PushMessagingEventRouter;
@@ skipping 426 matching lines @@
   }
 
   extensions::BrowserEventRouter* browser_event_router() {
     return browser_event_router_.get();
   }
 
   extensions::WindowEventRouter* window_event_router() {
     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();
   }
 #endif
 
   extensions::PushMessagingEventRouter* push_messaging_event_router() {
     return push_messaging_event_router_.get();
   }
 
   // Notify the frontend that there was an error loading an extension.
@@ skipping 311 matching lines @@
   scoped_ptr<extensions::PushMessagingEventRouter>
       push_messaging_event_router_;
 
   scoped_ptr<extensions::WebNavigationEventRouter> web_navigation_event_router_;
 
   scoped_ptr<extensions::FontSettingsEventRouter> font_settings_event_router_;
 
   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
 
   // A collection of external extension providers.  Each provider reads
   // a source of external extension information.  Examples include the
   // windows registry and external_extensions.json.
   extensions::ProviderCollection external_extension_providers_;
 
   // Set to true by OnExternalExtensionUpdateUrlFound() when an external
@@ skipping 23 matching lines @@
 #endif
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_