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

Side by Side Diff: chromeos/network/network_sms_handler.cc

Issue 816973003: Fix WeakPtrFactory members in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « chromeos/network/dhcp_proxy_script_fetcher_chromeos.h ('k') | no next file » | 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) 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 "chromeos/network/network_sms_handler.h" 5 #include "chromeos/network/network_sms_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void ListCallback(const base::ListValue& message_list); 63 void ListCallback(const base::ListValue& message_list);
64 void SmsReceivedCallback(uint32 index, bool complete); 64 void SmsReceivedCallback(uint32 index, bool complete);
65 void GetCallback(uint32 index, const base::DictionaryValue& dictionary); 65 void GetCallback(uint32 index, const base::DictionaryValue& dictionary);
66 void DeleteMessages(); 66 void DeleteMessages();
67 void MessageReceived(const base::DictionaryValue& dictionary); 67 void MessageReceived(const base::DictionaryValue& dictionary);
68 68
69 NetworkSmsHandler* host_; 69 NetworkSmsHandler* host_;
70 std::string service_name_; 70 std::string service_name_;
71 dbus::ObjectPath object_path_; 71 dbus::ObjectPath object_path_;
72 bool deleting_messages_; 72 bool deleting_messages_;
73 std::vector<uint32> delete_queue_;
73 base::WeakPtrFactory<ModemManagerNetworkSmsDeviceHandler> weak_ptr_factory_; 74 base::WeakPtrFactory<ModemManagerNetworkSmsDeviceHandler> weak_ptr_factory_;
74 std::vector<uint32> delete_queue_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(ModemManagerNetworkSmsDeviceHandler); 76 DISALLOW_COPY_AND_ASSIGN(ModemManagerNetworkSmsDeviceHandler);
77 }; 77 };
78 78
79 NetworkSmsHandler:: 79 NetworkSmsHandler::
80 ModemManagerNetworkSmsDeviceHandler::ModemManagerNetworkSmsDeviceHandler( 80 ModemManagerNetworkSmsDeviceHandler::ModemManagerNetworkSmsDeviceHandler(
81 NetworkSmsHandler* host, 81 NetworkSmsHandler* host,
82 const std::string& service_name, 82 const std::string& service_name,
83 const dbus::ObjectPath& object_path) 83 const dbus::ObjectPath& object_path)
84 : host_(host), 84 : host_(host),
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 void GetCallback(const base::DictionaryValue& dictionary); 187 void GetCallback(const base::DictionaryValue& dictionary);
188 void DeleteMessages(); 188 void DeleteMessages();
189 void GetMessages(); 189 void GetMessages();
190 void MessageReceived(const base::DictionaryValue& dictionary); 190 void MessageReceived(const base::DictionaryValue& dictionary);
191 191
192 NetworkSmsHandler* host_; 192 NetworkSmsHandler* host_;
193 std::string service_name_; 193 std::string service_name_;
194 dbus::ObjectPath object_path_; 194 dbus::ObjectPath object_path_;
195 bool deleting_messages_; 195 bool deleting_messages_;
196 bool retrieving_messages_; 196 bool retrieving_messages_;
197 base::WeakPtrFactory<ModemManager1NetworkSmsDeviceHandler> weak_ptr_factory_;
198 std::vector<dbus::ObjectPath> delete_queue_; 197 std::vector<dbus::ObjectPath> delete_queue_;
199 std::deque<dbus::ObjectPath> retrieval_queue_; 198 std::deque<dbus::ObjectPath> retrieval_queue_;
199 base::WeakPtrFactory<ModemManager1NetworkSmsDeviceHandler> weak_ptr_factory_;
200 200
201 DISALLOW_COPY_AND_ASSIGN(ModemManager1NetworkSmsDeviceHandler); 201 DISALLOW_COPY_AND_ASSIGN(ModemManager1NetworkSmsDeviceHandler);
202 }; 202 };
203 203
204 NetworkSmsHandler:: 204 NetworkSmsHandler::
205 ModemManager1NetworkSmsDeviceHandler::ModemManager1NetworkSmsDeviceHandler( 205 ModemManager1NetworkSmsDeviceHandler::ModemManager1NetworkSmsDeviceHandler(
206 NetworkSmsHandler* host, 206 NetworkSmsHandler* host,
207 const std::string& service_name, 207 const std::string& service_name,
208 const dbus::ObjectPath& object_path) 208 const dbus::ObjectPath& object_path)
209 : host_(host), 209 : host_(host),
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 new ModemManager1NetworkSmsDeviceHandler( 476 new ModemManager1NetworkSmsDeviceHandler(
477 this, service_name, object_path)); 477 this, service_name, object_path));
478 } else { 478 } else {
479 device_handlers_.push_back( 479 device_handlers_.push_back(
480 new ModemManagerNetworkSmsDeviceHandler( 480 new ModemManagerNetworkSmsDeviceHandler(
481 this, service_name, object_path)); 481 this, service_name, object_path));
482 } 482 }
483 } 483 }
484 484
485 } // namespace chromeos 485 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/dhcp_proxy_script_fetcher_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698