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

Side by Side Diff: chromeos/dbus/nfc_device_client.h

Issue 99903003: nfc: Various fixes to the NFC D-Bus client in chromeos/dbus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed clang error. Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/nfc_client_unittest.cc ('k') | chromeos/dbus/nfc_device_client.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROMEOS_DBUS_NFC_DEVICE_CLIENT_H_ 5 #ifndef CHROMEOS_DBUS_NFC_DEVICE_CLIENT_H_
6 #define CHROMEOS_DBUS_NFC_DEVICE_CLIENT_H_ 6 #define CHROMEOS_DBUS_NFC_DEVICE_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/values.h"
12 #include "chromeos/chromeos_export.h" 13 #include "chromeos/chromeos_export.h"
13 #include "chromeos/dbus/dbus_client.h" 14 #include "chromeos/dbus/dbus_client.h"
14 #include "chromeos/dbus/nfc_client_helpers.h" 15 #include "chromeos/dbus/nfc_client_helpers.h"
15 #include "chromeos/dbus/nfc_property_set.h" 16 #include "chromeos/dbus/nfc_property_set.h"
16 #include "chromeos/dbus/nfc_record_client.h" 17 #include "chromeos/dbus/nfc_record_client.h"
17 #include "dbus/object_path.h" 18 #include "dbus/object_path.h"
18 #include "dbus/object_proxy.h" 19 #include "dbus/object_proxy.h"
19 #include "dbus/property.h" 20 #include "dbus/property.h"
20 21
21 namespace chromeos { 22 namespace chromeos {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // "Language": "en", 84 // "Language": "en",
84 // "Representation": "Chrome OS rulez!" 85 // "Representation": "Chrome OS rulez!"
85 // }, 86 // },
86 // { 87 // {
87 // "Type": "URI", 88 // "Type": "URI",
88 // "URI": "http://www.chromium.org" 89 // "URI": "http://www.chromium.org"
89 // }, 90 // },
90 // etc. 91 // etc.
91 virtual void Push( 92 virtual void Push(
92 const dbus::ObjectPath& object_path, 93 const dbus::ObjectPath& object_path,
93 const NfcRecordClient::Attributes& attributes, 94 const base::DictionaryValue& attributes,
94 const base::Closure& callback, 95 const base::Closure& callback,
95 const nfc_client_helpers::ErrorCallback& error_callback) = 0; 96 const nfc_client_helpers::ErrorCallback& error_callback) = 0;
96 97
97 // Creates the instance. 98 // Creates the instance.
98 static NfcDeviceClient* Create(NfcAdapterClient* adapter_client); 99 static NfcDeviceClient* Create(NfcAdapterClient* adapter_client);
99 100
100 protected: 101 protected:
101 friend class NfcClientTest; 102 friend class NfcClientTest;
102 103
103 NfcDeviceClient(); 104 NfcDeviceClient();
104 105
105 private: 106 private:
106 DISALLOW_COPY_AND_ASSIGN(NfcDeviceClient); 107 DISALLOW_COPY_AND_ASSIGN(NfcDeviceClient);
107 }; 108 };
108 109
109 } // namespace chromeos 110 } // namespace chromeos
110 111
111 #endif // CHROMEOS_DBUS_NFC_DEVICE_CLIENT_H_ 112 #endif // CHROMEOS_DBUS_NFC_DEVICE_CLIENT_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/nfc_client_unittest.cc ('k') | chromeos/dbus/nfc_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698