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

Unified Diff: chrome/browser/extensions/api/dial/dial_device_data.cc

Issue 2756483007: [Device Discovery] Move files from browser/extensions/api/dial to browser/media/router/discovery/di… (Closed)
Patch Set: resolve code review comments from Devlin Created 3 years, 9 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/extensions/api/dial/dial_device_data.cc
diff --git a/chrome/browser/extensions/api/dial/dial_device_data.cc b/chrome/browser/extensions/api/dial/dial_device_data.cc
deleted file mode 100644
index 1db2e5c38b51a53b82e63598c7b469aaf90acdc9..0000000000000000000000000000000000000000
--- a/chrome/browser/extensions/api/dial/dial_device_data.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2012 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/extensions/api/dial/dial_device_data.h"
-
-#include "chrome/common/extensions/api/dial.h"
-
-namespace extensions {
-namespace api {
-namespace dial {
-
-DialDeviceData::DialDeviceData() : max_age_(-1), config_id_(-1) { }
-
-DialDeviceData::DialDeviceData(const std::string& device_id,
- const GURL& device_description_url,
- const base::Time& response_time)
- : device_id_(device_id), device_description_url_(device_description_url),
- response_time_(response_time), max_age_(-1), config_id_(-1) {
-}
-
-DialDeviceData::DialDeviceData(const DialDeviceData& other) = default;
-
-DialDeviceData::~DialDeviceData() { }
-
-const GURL& DialDeviceData::device_description_url() const {
- return device_description_url_;
-}
-
-void DialDeviceData::set_device_description_url(const GURL& url) {
- device_description_url_ = url;
-}
-
-// static
-bool DialDeviceData::IsDeviceDescriptionUrl(const GURL& url) {
- return url.is_valid() && !url.is_empty() && url.SchemeIsHTTPOrHTTPS();
-}
-
-bool DialDeviceData::UpdateFrom(const DialDeviceData& new_data) {
- DCHECK(new_data.device_id() == device_id_);
- DCHECK(new_data.label().empty());
- std::string label_tmp(label_);
- bool updated_api_visible_field =
- (new_data.device_description_url() != device_description_url_) ||
- (new_data.config_id() != config_id_);
- *this = new_data;
- label_ = label_tmp;
- return updated_api_visible_field;
-}
-
-void DialDeviceData::FillDialDevice(api::dial::DialDevice* device) const {
- DCHECK(!device_id_.empty());
- DCHECK(IsDeviceDescriptionUrl(device_description_url_));
- device->device_label = label_;
- device->device_description_url = device_description_url_.spec();
- if (has_config_id())
- device->config_id.reset(new int(config_id_));
-}
-
-DialDeviceDescriptionData::DialDeviceDescriptionData(
- const std::string& device_description,
- const GURL& app_url)
- : device_description(device_description), app_url(app_url) {}
-
-} // namespace dial
-} // namespace api
-} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/api/dial/dial_device_data.h ('k') | chrome/browser/extensions/api/dial/dial_device_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698