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

Side by Side Diff: chrome/browser/media/router/media_sink.cc

Issue 2666873006: [Media Router] Convert to use typemaps for media_router.mojom. (Closed)
Patch Set: Remove DCHECK since tests are hitting the code path 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/media/router/media_sink.h ('k') | chrome/browser/media/router/media_source.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/i18n/string_compare.h" 5 #include "base/i18n/string_compare.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/media/router/media_sink.h" 7 #include "chrome/browser/media/router/media_sink.h"
8 #include "third_party/icu/source/i18n/unicode/coll.h" 8 #include "third_party/icu/source/i18n/unicode/coll.h"
9 9
10 namespace media_router { 10 namespace media_router {
11 11
12 MediaSink::MediaSink(const MediaSink::Id& sink_id, 12 MediaSink::MediaSink(const MediaSink::Id& sink_id,
13 const std::string& name, 13 const std::string& name,
14 const MediaSink::IconType icon_type) 14 const MediaSink::IconType icon_type)
15 : sink_id_(sink_id), name_(name), icon_type_(icon_type) {} 15 : sink_id_(sink_id), name_(name), icon_type_(icon_type) {}
16 16
17 MediaSink::MediaSink(const MediaSink& other) = default; 17 MediaSink::MediaSink(const MediaSink& other) = default;
18 18
19 MediaSink::MediaSink() {}
20
19 MediaSink::~MediaSink() { 21 MediaSink::~MediaSink() {
20 } 22 }
21 23
22 bool MediaSink::Equals(const MediaSink& other) const { 24 bool MediaSink::Equals(const MediaSink& other) const {
23 return sink_id_ == other.sink_id_; 25 return sink_id_ == other.sink_id_;
24 } 26 }
25 27
26 bool MediaSink::CompareUsingCollator(const MediaSink& other, 28 bool MediaSink::CompareUsingCollator(const MediaSink& other,
27 const icu::Collator* collator) const { 29 const icu::Collator* collator) const {
28 if (icon_type_ != other.icon_type_) 30 if (icon_type_ != other.icon_type_)
(...skipping 11 matching lines...) Expand all
40 // available. 42 // available.
41 int val = name_.compare(other.name_); 43 int val = name_.compare(other.name_);
42 if (val) 44 if (val)
43 return val < 0; 45 return val < 0;
44 } 46 }
45 47
46 return sink_id_ < other.sink_id_; 48 return sink_id_ < other.sink_id_;
47 } 49 }
48 50
49 } // namespace media_router 51 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/router/media_sink.h ('k') | chrome/browser/media/router/media_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698