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 namespace api { | 10 namespace api { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 | 50 |
51 void DialDeviceData::FillDialDevice(api::dial::DialDevice* device) const { | 51 void DialDeviceData::FillDialDevice(api::dial::DialDevice* device) const { |
52 DCHECK(!device_id_.empty()); | 52 DCHECK(!device_id_.empty()); |
53 DCHECK(IsDeviceDescriptionUrl(device_description_url_)); | 53 DCHECK(IsDeviceDescriptionUrl(device_description_url_)); |
54 device->device_label = label_; | 54 device->device_label = label_; |
55 device->device_description_url = device_description_url_.spec(); | 55 device->device_description_url = device_description_url_.spec(); |
56 if (has_config_id()) | 56 if (has_config_id()) |
57 device->config_id.reset(new int(config_id_)); | 57 device->config_id.reset(new int(config_id_)); |
58 } | 58 } |
59 | 59 |
| 60 DialDeviceDescriptionData::DialDeviceDescriptionData( |
| 61 const std::string& device_description, |
| 62 const GURL& app_url) |
| 63 : device_description(device_description), app_url(app_url) {} |
| 64 |
60 } // namespace dial | 65 } // namespace dial |
61 } // namespace api | 66 } // namespace api |
62 } // namespace extensions | 67 } // namespace extensions |
OLD | NEW |