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

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

Issue 395333003: Extensions: Move cast_channel and hid APIs to extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win/mac 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/cast_channel/cast_channel_api.h
diff --git a/chrome/browser/extensions/api/cast_channel/cast_channel_api.h b/extensions/browser/api/cast_channel/cast_channel_api.h
similarity index 90%
rename from chrome/browser/extensions/api/cast_channel/cast_channel_api.h
rename to extensions/browser/api/cast_channel/cast_channel_api.h
index 6d60de2127f2ee3dd3b99f04a8b2957d1b65681b..f2c5dd705fe8168be0331b6f700a80cfcb2a0811 100644
--- a/chrome/browser/extensions/api/cast_channel/cast_channel_api.h
+++ b/extensions/browser/api/cast_channel/cast_channel_api.h
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
-#define CHROME_BROWSER_EXTENSIONS_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
+#ifndef EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
+#define EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
-#include "chrome/browser/extensions/api/cast_channel/cast_socket.h"
-#include "chrome/common/extensions/api/cast_channel.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"
class GURL;
class CastChannelAPITest;
@@ -27,11 +27,10 @@ class IPEndPoint;
namespace extensions {
-namespace cast_channel = api::cast_channel;
+namespace cast_channel = core_api::cast_channel;
class CastChannelAPI : public BrowserContextKeyedAPI,
public cast_channel::CastSocket::Delegate {
-
public:
explicit CastChannelAPI(content::BrowserContext* context);
@@ -137,12 +136,12 @@ class CastChannelOpenFunction : public CastChannelAsyncApiFunction {
// corresponding details, and returns true. Returns false if |url| is not a
// valid Cast URL.
static bool ParseChannelUrl(const GURL& url,
- api::cast_channel::ConnectInfo* connect_info);
+ cast_channel::ConnectInfo* connect_info);
// Validates that |connect_info| represents a valid IP end point and returns a
// new IPEndPoint if so. Otherwise returns NULL.
static net::IPEndPoint* ParseConnectInfo(
- const api::cast_channel::ConnectInfo& connect_info);
+ const cast_channel::ConnectInfo& connect_info);
void OnOpen(int result);
@@ -150,9 +149,9 @@ class CastChannelOpenFunction : public CastChannelAsyncApiFunction {
// The id of the newly opened socket.
int new_channel_id_;
CastChannelAPI* api_;
- scoped_ptr<api::cast_channel::ConnectInfo> connect_info_;
+ scoped_ptr<cast_channel::ConnectInfo> connect_info_;
scoped_ptr<net::IPEndPoint> ip_endpoint_;
- api::cast_channel::ChannelAuthType channel_auth_;
+ cast_channel::ChannelAuthType channel_auth_;
FRIEND_TEST_ALL_PREFIXES(CastChannelOpenFunctionTest, TestParseChannelUrl);
FRIEND_TEST_ALL_PREFIXES(CastChannelOpenFunctionTest, TestParseConnectInfo);
@@ -203,4 +202,4 @@ class CastChannelCloseFunction : public CastChannelAsyncApiFunction {
} // namespace extensions
-#endif // CHROME_BROWSER_EXTENSIONS_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
+#endif // EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_

Powered by Google App Engine
This is Rietveld 408576698