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

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

Issue 2891923004: [cast_channel] Make cast_channel related files not depend on "cast_channel.h" (Closed)
Patch Set: rename cast_channel_type to cast_channel_enum Created 3 years, 7 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 c257599da0abc997db1b5bd771a95346cc2bdf88..ce2d3c55c87efc81dd9e02b05402c7ec38a7bc89 100644
--- a/extensions/browser/api/cast_channel/cast_channel_api.h
+++ b/extensions/browser/api/cast_channel/cast_channel_api.h
@@ -12,6 +12,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/threading/thread_checker.h"
+#include "components/cast_channel/cast_channel_enum.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"
@@ -176,7 +177,7 @@ class CastChannelOpenFunction : public CastChannelAsyncApiFunction {
~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;
@@ -197,14 +198,14 @@ class CastChannelOpenFunction : public CastChannelAsyncApiFunction {
static net::IPEndPoint* ParseConnectInfo(
const cast_channel::ConnectInfo& connect_info);
- void OnOpen(cast_channel::ChannelError result);
+ 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_;

Powered by Google App Engine
This is Rietveld 408576698