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

Side by Side Diff: dbus/object_proxy.h

Issue 8681002: dbus: Fix a bug where we were emitting spurious error messages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 9 years, 1 month 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 | « dbus/end_to_end_async_unittest.cc ('k') | dbus/object_proxy.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 DBUS_OBJECT_PROXY_H_ 5 #ifndef DBUS_OBJECT_PROXY_H_
6 #define DBUS_OBJECT_PROXY_H_ 6 #define DBUS_OBJECT_PROXY_H_
7 #pragma once 7 #pragma once
8 8
9 #include <dbus/dbus.h> 9 #include <dbus/dbus.h>
10 10
11 #include <map> 11 #include <map>
12 #include <set>
12 #include <string> 13 #include <string>
13 #include <vector>
14 14
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
17 #include "base/time.h" 17 #include "base/time.h"
18 18
19 namespace dbus { 19 namespace dbus {
20 20
21 class Bus; 21 class Bus;
22 class MethodCall; 22 class MethodCall;
23 class Response; 23 class Response;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 std::string object_path_; 185 std::string object_path_;
186 186
187 // True if the message filter was added. 187 // True if the message filter was added.
188 bool filter_added_; 188 bool filter_added_;
189 189
190 // The method table where keys are absolute signal names (i.e. interface 190 // The method table where keys are absolute signal names (i.e. interface
191 // name + signal name), and values are the corresponding callbacks. 191 // name + signal name), and values are the corresponding callbacks.
192 typedef std::map<std::string, SignalCallback> MethodTable; 192 typedef std::map<std::string, SignalCallback> MethodTable;
193 MethodTable method_table_; 193 MethodTable method_table_;
194 194
195 std::vector<std::string> match_rules_; 195 std::set<std::string> match_rules_;
196 196
197 DISALLOW_COPY_AND_ASSIGN(ObjectProxy); 197 DISALLOW_COPY_AND_ASSIGN(ObjectProxy);
198 }; 198 };
199 199
200 } // namespace dbus 200 } // namespace dbus
201 201
202 #endif // DBUS_OBJECT_PROXY_H_ 202 #endif // DBUS_OBJECT_PROXY_H_
OLDNEW
« no previous file with comments | « dbus/end_to_end_async_unittest.cc ('k') | dbus/object_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698