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

Unified Diff: extensions/browser/api/cast_channel/cast_channel_api.h

Issue 2926313002: Revert of [cast_channel] Move cast_channel related files from //extensions to //components (Closed)
Patch Set: Created 3 years, 6 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/cast_channel/cast_channel_api.h
diff --git a/extensions/browser/api/cast_channel/cast_channel_api.h b/extensions/browser/api/cast_channel/cast_channel_api.h
index 0a50bb8b7fad054a157dcb67f4e12ac95fb399f3..21db4b4564e8630a5963795f06a82aea52b8e69c 100644
--- a/extensions/browser/api/cast_channel/cast_channel_api.h
+++ b/extensions/browser/api/cast_channel/cast_channel_api.h
@@ -13,9 +13,9 @@
#include "base/memory/ref_counted.h"
#include "base/threading/thread_checker.h"
#include "components/cast_channel/cast_channel_enum.h"
-#include "components/cast_channel/cast_socket.h"
-#include "components/cast_channel/proto/logging.pb.h"
+#include "extensions/browser/api/api_resource_manager.h"
#include "extensions/browser/api/async_api_function.h"
+#include "extensions/browser/api/cast_channel/cast_socket.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
#include "extensions/common/api/cast_channel.h"
@@ -29,13 +29,18 @@
class IPEndPoint;
}
+namespace extensions {
+
+struct Event;
+
+namespace api {
namespace cast_channel {
class CastSocketService;
+class Logger;
} // namespace cast_channel
-
-namespace extensions {
-
-struct Event;
+} // namespace api
+
+namespace cast_channel = api::cast_channel;
class CastChannelAPI : public BrowserContextKeyedAPI,
public base::SupportsWeakPtr<CastChannelAPI> {
@@ -111,16 +116,14 @@
// Sets the function result to a ChannelInfo populated with |channel_id| and
// |error|.
- void SetResultFromError(int channel_id,
- api::cast_channel::ChannelError error);
+ void SetResultFromError(int channel_id, cast_channel::ChannelError error);
// Manages creating and removing Cast sockets.
- scoped_refptr<cast_channel::CastSocketService> cast_socket_service_;
+ scoped_refptr<api::cast_channel::CastSocketService> cast_socket_service_;
private:
// Sets the function result from |channel_info|.
- void SetResultFromChannelInfo(
- const api::cast_channel::ChannelInfo& channel_info);
+ void SetResultFromChannelInfo(const cast_channel::ChannelInfo& channel_info);
};
class CastChannelOpenFunction : public CastChannelAsyncApiFunction {
@@ -149,11 +152,11 @@
public:
CastMessageHandler(const EventDispatchCallback& ui_dispatch_cb,
cast_channel::CastSocket* socket,
- scoped_refptr<cast_channel::Logger> logger);
+ scoped_refptr<api::cast_channel::Logger> logger);
~CastMessageHandler() override;
// CastTransport::Delegate implementation.
- void OnError(cast_channel::ChannelError error_state) override;
+ void OnError(::cast_channel::ChannelError error_state) override;
void OnMessage(const cast_channel::CastMessage& message) override;
void Start() override;
@@ -164,7 +167,7 @@
EventDispatchCallback const ui_dispatch_cb_;
cast_channel::CastSocket* const socket_;
// Logger object for reporting error details.
- scoped_refptr<cast_channel::Logger> logger_;
+ scoped_refptr<api::cast_channel::Logger> logger_;
DISALLOW_COPY_AND_ASSIGN(CastMessageHandler);
};
@@ -172,16 +175,16 @@
// Validates that |connect_info| represents a valid IP end point and returns a
// new IPEndPoint if so. Otherwise returns nullptr.
static net::IPEndPoint* ParseConnectInfo(
- const api::cast_channel::ConnectInfo& connect_info);
-
- void OnOpen(cast_channel::ChannelError result);
-
- std::unique_ptr<api::cast_channel::Open::Params> params_;
+ const cast_channel::ConnectInfo& connect_info);
+
+ void OnOpen(::cast_channel::ChannelError result);
+
+ std::unique_ptr<cast_channel::Open::Params> params_;
// The id of the newly opened socket.
int new_channel_id_;
CastChannelAPI* api_;
std::unique_ptr<net::IPEndPoint> ip_endpoint_;
- cast_channel::ChannelAuthType channel_auth_;
+ ::cast_channel::ChannelAuthType channel_auth_;
base::TimeDelta liveness_timeout_;
base::TimeDelta ping_interval_;
@@ -205,7 +208,7 @@
void OnSend(int result);
- std::unique_ptr<api::cast_channel::Send::Params> params_;
+ std::unique_ptr<cast_channel::Send::Params> params_;
DISALLOW_COPY_AND_ASSIGN(CastChannelSendFunction);
};
@@ -227,7 +230,7 @@
void OnClose(int result);
- std::unique_ptr<api::cast_channel::Close::Params> params_;
+ std::unique_ptr<cast_channel::Close::Params> params_;
CastChannelAPI* api_;
DISALLOW_COPY_AND_ASSIGN(CastChannelCloseFunction);

Powered by Google App Engine
This is Rietveld 408576698