| Index: chrome/browser/extensions/api/serial/serial_event_dispatcher.h
|
| diff --git a/chrome/browser/extensions/api/serial/serial_event_dispatcher.h b/chrome/browser/extensions/api/serial/serial_event_dispatcher.h
|
| index 83b8938866c8453f29102483985619519016afed..49abfd7d9d905fd0ac5cad2a1d7bbc787667ff91 100644
|
| --- a/chrome/browser/extensions/api/serial/serial_event_dispatcher.h
|
| +++ b/chrome/browser/extensions/api/serial/serial_event_dispatcher.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_API_SERIAL_SERIAL_EVENT_DISPATCHER_H_
|
| #define CHROME_BROWSER_EXTENSIONS_API_SERIAL_SERIAL_EVENT_DISPATCHER_H_
|
|
|
| -#include "chrome/browser/extensions/api/api_resource_manager.h"
|
| #include "chrome/common/extensions/api/serial.h"
|
| +#include "extensions/browser/api/api_resource_manager.h"
|
|
|
| class Profile;
|
|
|
| @@ -37,9 +37,7 @@ class SerialEventDispatcher : public BrowserContextKeyedAPI {
|
| friend class BrowserContextKeyedAPIFactory<SerialEventDispatcher>;
|
|
|
| // BrowserContextKeyedAPI implementation.
|
| - static const char *service_name() {
|
| - return "SerialEventDispatcher";
|
| - }
|
| + static const char* service_name() { return "SerialEventDispatcher"; }
|
| static const bool kServiceHasOwnInstanceInIncognito = true;
|
| static const bool kServiceIsNULLWhileTesting = true;
|
|
|
| @@ -63,7 +61,7 @@ class SerialEventDispatcher : public BrowserContextKeyedAPI {
|
| static void PostEvent(const ReceiveParams& params,
|
| scoped_ptr<extensions::Event> event);
|
|
|
| - static void DispatchEvent(void *profile_id,
|
| + static void DispatchEvent(void* profile_id,
|
| const std::string& extension_id,
|
| scoped_ptr<extensions::Event> event);
|
|
|
|
|