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

Unified Diff: chrome/browser/media/router/discovery/dial/dial_device_data.h

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/media/router/discovery/dial/dial_device_data.h
diff --git a/chrome/browser/extensions/api/dial/dial_device_data.h b/chrome/browser/media/router/discovery/dial/dial_device_data.h
similarity index 82%
rename from chrome/browser/extensions/api/dial/dial_device_data.h
rename to chrome/browser/media/router/discovery/dial/dial_device_data.h
index 4706885a465399094231af55d21504714f6dec06..01ace7b3ce466d410a472621ae003b9da0412388 100644
--- a/chrome/browser/extensions/api/dial/dial_device_data.h
+++ b/chrome/browser/media/router/discovery/dial/dial_device_data.h
@@ -2,8 +2,8 @@
// 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_DIAL_DIAL_DEVICE_DATA_H_
-#define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_DEVICE_DATA_H_
+#ifndef CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DIAL_DIAL_DEVICE_DATA_H_
+#define CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DIAL_DIAL_DEVICE_DATA_H_
#include <string>
#include <vector>
@@ -12,11 +12,7 @@
#include "base/values.h"
#include "url/gurl.h"
-namespace extensions {
-namespace api {
-namespace dial {
-
-struct DialDevice;
+namespace media_router {
// Dial device information that is used within the DialService and Registry on
// the IO thread. It is updated as new information arrives and a list of
@@ -35,14 +31,10 @@ class DialDeviceData {
}
const std::string& device_id() const { return device_id_; }
- void set_device_id(const std::string& id) {
- device_id_ = id;
- }
+ void set_device_id(const std::string& id) { device_id_ = id; }
const std::string& label() const { return label_; }
- void set_label(const std::string& label) {
- label_ = label;
- }
+ void set_label(const std::string& label) { label_ = label; }
const GURL& device_description_url() const;
void set_device_description_url(const GURL& url);
@@ -60,9 +52,6 @@ class DialDeviceData {
void set_config_id(int config_id) { config_id_ = config_id; }
bool has_config_id() const { return config_id_ >= 0; }
- // Fills the |device| API struct from this instance.
- void FillDialDevice(api::dial::DialDevice* device) const;
-
// Updates this DeviceData based on information from a new response in
// |new_data|. Returns |true| if a field was updated that is visible through
// the DIAL API.
@@ -102,8 +91,6 @@ struct DialDeviceDescriptionData {
GURL app_url;
};
-} // namespace dial
-} // namespace api
-} // namespace extensions
+} // namespace media_router
-#endif // CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_DEVICE_DATA_H_
+#endif // CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DIAL_DIAL_DEVICE_DATA_H_

Powered by Google App Engine
This is Rietveld 408576698