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

Unified Diff: chrome/browser/media/router/media_sink.cc

Issue 2771413003: Move c/b/media/router/mojo/*.mojom to chrome/common/media_router/mojo/*.mojom (Closed)
Patch Set: Rebase Created 3 years, 8 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/media_sink.cc
diff --git a/chrome/browser/media/router/media_sink.cc b/chrome/browser/media/router/media_sink.cc
deleted file mode 100644
index a48435030972946f1a9283967848fe35a24d63d2..0000000000000000000000000000000000000000
--- a/chrome/browser/media/router/media_sink.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015 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 "base/i18n/string_compare.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/media/router/media_sink.h"
-#include "third_party/icu/source/i18n/unicode/coll.h"
-
-namespace media_router {
-
-MediaSink::MediaSink(const MediaSink::Id& sink_id,
- const std::string& name,
- const MediaSink::IconType icon_type)
- : sink_id_(sink_id), name_(name), icon_type_(icon_type) {}
-
-MediaSink::MediaSink(const MediaSink& other) = default;
-
-MediaSink::MediaSink() {}
-
-MediaSink::~MediaSink() {
-}
-
-bool MediaSink::Equals(const MediaSink& other) const {
- return sink_id_ == other.sink_id_;
-}
-
-bool MediaSink::operator==(const MediaSink& other) const {
- return sink_id_ == other.sink_id_ && name_ == other.name_ &&
- description_ == other.description_ && domain_ == other.domain_ &&
- icon_type_ == other.icon_type_;
-}
-
-bool MediaSink::operator!=(const MediaSink& other) const {
- return !operator==(other);
-}
-
-bool MediaSink::CompareUsingCollator(const MediaSink& other,
- const icu::Collator* collator) const {
- if (icon_type_ != other.icon_type_)
- return icon_type_ < other.icon_type_;
-
- if (collator) {
- base::string16 this_name = base::UTF8ToUTF16(name_);
- base::string16 other_name = base::UTF8ToUTF16(other.name_);
- UCollationResult result = base::i18n::CompareString16WithCollator(
- *collator, this_name, other_name);
- if (result != UCOL_EQUAL)
- return result == UCOL_LESS;
- } else {
- // Fall back to simple string comparison if collator is not
- // available.
- int val = name_.compare(other.name_);
- if (val)
- return val < 0;
- }
-
- return sink_id_ < other.sink_id_;
-}
-
-} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698