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

Unified Diff: chrome/browser/media/router/discovery/media_sink_internal.cc

Issue 2675033002: [Media Router] Add MediaSink subtypes (Closed)
Patch Set: resolve code review comments from Derek and Mark Created 3 years, 10 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: chrome/browser/media/router/discovery/media_sink_internal.cc
diff --git a/chrome/browser/media/router/discovery/media_sink_internal.cc b/chrome/browser/media/router/discovery/media_sink_internal.cc
new file mode 100644
index 0000000000000000000000000000000000000000..71eafc7f03780d3d028b60aa051e6164998b5743
--- /dev/null
+++ b/chrome/browser/media/router/discovery/media_sink_internal.cc
@@ -0,0 +1,95 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/media/router/discovery/media_sink_internal.h"
+
+#include <algorithm>
+#include "base/logging.h"
+#include "net/base/ip_address.h"
+
+namespace {
+bool IsValidSinkIdChar(char ch) {
mark a. foltz 2017/02/28 00:05:29 I would just simplify this to base::IsStringAscii
zhaobin 2017/02/28 18:46:28 Done.
+ return (('A' <= ch) && (ch <= 'Z')) || (('a' <= ch) && (ch <= 'z')) ||
zhaobin 2017/02/27 21:45:15 This check passes for our cloud view devices. Not
+ (('0' <= ch) && (ch <= '9')) || (ch == '+') || (ch == '/') ||
+ (ch == '-') || (ch == '_') || (ch == '.');
+}
+}
+
+namespace media_router {
+
+MediaSinkInternal::MediaSinkInternal(const MediaSink& sink) : sink_(sink) {}
+
+MediaSinkInternal::MediaSinkInternal(const MediaSink& sink,
+ const DialSinkExtraData& dial_data)
+ : sink_(sink), dial_data_(dial_data) {}
+
+MediaSinkInternal::MediaSinkInternal(const MediaSink& sink,
+ const CastSinkExtraData& cast_data)
+ : sink_(sink), cast_data_(cast_data) {}
+
+MediaSinkInternal::MediaSinkInternal() = default;
+
+MediaSinkInternal::MediaSinkInternal(const MediaSinkInternal& other) = default;
+
+MediaSinkInternal::~MediaSinkInternal() = default;
+
+MediaSinkInternal& MediaSinkInternal::operator=(
+ const MediaSinkInternal& other) = default;
+
+void MediaSinkInternal::set_sink(const MediaSink& sink) {
+ sink_ = sink;
+}
+
+void MediaSinkInternal::set_dial_data(const DialSinkExtraData& dial_data) {
+ DCHECK(dial_data_ || !cast_data_);
+ dial_data_ = dial_data;
+}
+
+const DialSinkExtraData& MediaSinkInternal::dial_data() const {
+ DCHECK(is_dial_sink());
+ return *dial_data_;
+}
+
+void MediaSinkInternal::set_cast_data(const CastSinkExtraData& cast_data) {
+ DCHECK(cast_data_ || !dial_data_);
+ cast_data_ = cast_data;
+}
+
+const CastSinkExtraData& MediaSinkInternal::cast_data() const {
+ DCHECK(is_cast_sink());
+ return *cast_data_;
+}
+
+// static
+bool MediaSinkInternal::IsValidSinkId(const std::string& sink_id) {
+ if (sink_id.empty())
+ return false;
+
+ bool is_valid = std::find_if(sink_id.begin(), sink_id.end(), [](char c) {
+ return !IsValidSinkIdChar(c);
+ }) == sink_id.end();
+
+ if (!is_valid)
+ DLOG(WARNING) << "Invalid [sink_id]: " << sink_id;
+
+ return is_valid;
+}
+
+bool MediaSinkInternal::IsValidIPAddress(const std::string& ip_address) {
+ net::IPAddress address;
+ if (!address.AssignFromIPLiteral(ip_address))
+ return false;
+
+ return address.IsValid();
+}
+
+DialSinkExtraData::DialSinkExtraData() = default;
+DialSinkExtraData::DialSinkExtraData(const DialSinkExtraData& other) = default;
+DialSinkExtraData::~DialSinkExtraData() = default;
+
+CastSinkExtraData::CastSinkExtraData() = default;
+CastSinkExtraData::CastSinkExtraData(const CastSinkExtraData& other) = default;
+CastSinkExtraData::~CastSinkExtraData() = default;
+
+} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698