Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2088)

Unified Diff: extensions/browser/api/serial/serial_event_dispatcher.cc

Issue 369893008: Move the serial API to extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add missing dependency from usb_service to chromeos Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/serial/serial_event_dispatcher.cc
diff --git a/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc b/extensions/browser/api/serial/serial_event_dispatcher.cc
similarity index 74%
rename from chrome/browser/extensions/api/serial/serial_event_dispatcher.cc
rename to extensions/browser/api/serial/serial_event_dispatcher.cc
index 394580736d8f260196248604e238ec018c325f81..a02c07f38bedb9dc340d2f9d3b9557ac6302f900 100644
--- a/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc
+++ b/extensions/browser/api/serial/serial_event_dispatcher.cc
@@ -2,24 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/api/serial/serial_event_dispatcher.h"
+#include "extensions/browser/api/serial/serial_event_dispatcher.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/api/serial/serial_connection.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
+#include "extensions/browser/api/serial/serial_connection.h"
#include "extensions/browser/event_router.h"
+#include "extensions/browser/extensions_browser_client.h"
namespace extensions {
-namespace api {
+namespace core_api {
namespace {
bool ShouldPauseOnReceiveError(serial::ReceiveError error) {
return error == serial::RECEIVE_ERROR_DEVICE_LOST ||
- error == serial::RECEIVE_ERROR_SYSTEM_ERROR ||
- error == serial::RECEIVE_ERROR_DISCONNECTED;
+ error == serial::RECEIVE_ERROR_SYSTEM_ERROR ||
+ error == serial::RECEIVE_ERROR_DISCONNECTED;
}
} // namespace
@@ -40,19 +38,21 @@ SerialEventDispatcher* SerialEventDispatcher::Get(
}
SerialEventDispatcher::SerialEventDispatcher(content::BrowserContext* context)
- : thread_id_(SerialConnection::kThreadId),
- profile_(Profile::FromBrowserContext(context)) {
+ : thread_id_(SerialConnection::kThreadId), context_(context) {
ApiResourceManager<SerialConnection>* manager =
- ApiResourceManager<SerialConnection>::Get(profile_);
+ ApiResourceManager<SerialConnection>::Get(context_);
DCHECK(manager) << "No serial connection manager.";
connections_ = manager->data_;
}
-SerialEventDispatcher::~SerialEventDispatcher() {}
+SerialEventDispatcher::~SerialEventDispatcher() {
+}
-SerialEventDispatcher::ReceiveParams::ReceiveParams() {}
+SerialEventDispatcher::ReceiveParams::ReceiveParams() {
+}
-SerialEventDispatcher::ReceiveParams::~ReceiveParams() {}
+SerialEventDispatcher::ReceiveParams::~ReceiveParams() {
+}
void SerialEventDispatcher::PollConnection(const std::string& extension_id,
int connection_id) {
@@ -60,7 +60,7 @@ void SerialEventDispatcher::PollConnection(const std::string& extension_id,
ReceiveParams params;
params.thread_id = thread_id_;
- params.profile_id = profile_;
+ params.browser_context_id = context_;
params.extension_id = extension_id;
params.connections = connections_;
params.connection_id = connection_id;
@@ -120,9 +120,8 @@ void SerialEventDispatcher::ReceiveCallback(const ReceiveParams& params,
}
// Queue up the next read operation.
- BrowserThread::PostTask(params.thread_id,
- FROM_HERE,
- base::Bind(&StartReceive, params));
+ BrowserThread::PostTask(
+ params.thread_id, FROM_HERE, base::Bind(&StartReceive, params));
}
// static
@@ -130,29 +129,30 @@ void SerialEventDispatcher::PostEvent(const ReceiveParams& params,
scoped_ptr<extensions::Event> event) {
DCHECK_CURRENTLY_ON(params.thread_id);
- BrowserThread::PostTask(
- BrowserThread::UI, FROM_HERE,
- base::Bind(&DispatchEvent,
- params.profile_id,
- params.extension_id,
- base::Passed(event.Pass())));
+ BrowserThread::PostTask(BrowserThread::UI,
+ FROM_HERE,
+ base::Bind(&DispatchEvent,
+ params.browser_context_id,
+ params.extension_id,
+ base::Passed(event.Pass())));
}
// static
-void SerialEventDispatcher::DispatchEvent(void* profile_id,
+void SerialEventDispatcher::DispatchEvent(void* browser_context_id,
const std::string& extension_id,
scoped_ptr<extensions::Event> event) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- Profile* profile = reinterpret_cast<Profile*>(profile_id);
- if (!g_browser_process->profile_manager()->IsValidProfile(profile))
+ content::BrowserContext* context =
+ reinterpret_cast<content::BrowserContext*>(browser_context_id);
+ if (!extensions::ExtensionsBrowserClient::Get()->IsValidContext(context))
return;
- EventRouter* router = EventRouter::Get(profile);
+ EventRouter* router = EventRouter::Get(context);
if (router)
router->DispatchEventToExtension(extension_id, event.Pass());
}
-} // namespace api
+} // namespace core_api
} // namespace extensions
« no previous file with comments | « extensions/browser/api/serial/serial_event_dispatcher.h ('k') | extensions/browser/browser_context_keyed_service_factories.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698