| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/api/dial/dial_device_data.h" | 5 #include "chrome/browser/extensions/api/dial/dial_device_data.h" |
| 6 | 6 |
| 7 #include "chrome/common/extensions/api/dial.h" | 7 #include "chrome/common/extensions/api/dial.h" |
| 8 | 8 |
| 9 namespace extensions { | 9 namespace extensions { |
| 10 | 10 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 | 48 |
| 49 void DialDeviceData::FillDialDevice(api::dial::DialDevice* device) const { | 49 void DialDeviceData::FillDialDevice(api::dial::DialDevice* device) const { |
| 50 DCHECK(!device_id_.empty()); | 50 DCHECK(!device_id_.empty()); |
| 51 DCHECK(IsDeviceDescriptionUrl(device_description_url_)); | 51 DCHECK(IsDeviceDescriptionUrl(device_description_url_)); |
| 52 device->device_label = label_; | 52 device->device_label = label_; |
| 53 device->device_description_url = device_description_url_.spec(); | 53 device->device_description_url = device_description_url_.spec(); |
| 54 if (has_config_id()) | 54 if (has_config_id()) |
| 55 device->config_id.reset(new int(config_id_)); | 55 device->config_id.reset(new int(config_id_)); |
| 56 } | 56 } |
| 57 | 57 |
| 58 DialDeviceDescription::DialDeviceDescription( |
| 59 const std::string& device_description, |
| 60 const GURL& app_url) |
| 61 : device_description(device_description), app_url(app_url) {} |
| 62 |
| 58 } // namespace extensions | 63 } // namespace extensions |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2583853004:
[chrome.dial] Adds chrome.dial.fetchDeviceDecription API. (Closed)
