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

Side by Side Diff: chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc

Issue 1103713003: win: Move a few WeakPtrFactories to the end of their containing classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « no previous file | chrome/browser/notifications/message_center_notification_manager.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/local_discovery/wifi/wifi_manager_nonchromeos.h" 5 #include "chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h"
6 6
7 #include "base/cancelable_callback.h" 7 #include "base/cancelable_callback.h"
8 #include "base/threading/sequenced_worker_pool.h" 8 #include "base/threading/sequenced_worker_pool.h"
9 #include "base/threading/thread.h" 9 #include "base/threading/thread.h"
10 #include "components/onc/onc_constants.h" 10 #include "components/onc/onc_constants.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 base::CancelableClosure connect_failure_callback_; 115 base::CancelableClosure connect_failure_callback_;
116 116
117 // SSID of previously connected network. 117 // SSID of previously connected network.
118 std::string connected_network_guid_; 118 std::string connected_network_guid_;
119 119
120 // SSID of network we are connecting to. 120 // SSID of network we are connecting to.
121 std::string connecting_network_guid_; 121 std::string connecting_network_guid_;
122 122
123 scoped_refptr<base::MessageLoopProxy> callback_runner_; 123 scoped_refptr<base::MessageLoopProxy> callback_runner_;
124 124
125 base::WeakPtrFactory<WifiServiceWrapper> weak_factory_;
126
127 #if defined(OS_WIN) 125 #if defined(OS_WIN)
128 scoped_refptr<CredentialGetterWin> credential_getter_; 126 scoped_refptr<CredentialGetterWin> credential_getter_;
129 #endif // OS_WIN 127 #endif // OS_WIN
130 128
129 base::WeakPtrFactory<WifiServiceWrapper> weak_factory_;
130
131 DISALLOW_COPY_AND_ASSIGN(WifiServiceWrapper); 131 DISALLOW_COPY_AND_ASSIGN(WifiServiceWrapper);
132 }; 132 };
133 133
134 WifiManagerNonChromeos::WifiServiceWrapper::WifiServiceWrapper( 134 WifiManagerNonChromeos::WifiServiceWrapper::WifiServiceWrapper(
135 base::WeakPtr<WifiManagerNonChromeos> wifi_manager) 135 base::WeakPtr<WifiManagerNonChromeos> wifi_manager)
136 : wifi_manager_(wifi_manager), 136 : wifi_manager_(wifi_manager),
137 callback_runner_(base::MessageLoopProxy::current()), 137 callback_runner_(base::MessageLoopProxy::current()),
138 weak_factory_(this) { 138 weak_factory_(this) {
139 } 139 }
140 140
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 } 562 }
563 563
564 void WifiManagerNonChromeos::RemoveNetworkListObserver( 564 void WifiManagerNonChromeos::RemoveNetworkListObserver(
565 NetworkListObserver* observer) { 565 NetworkListObserver* observer) {
566 network_list_observers_.RemoveObserver(observer); 566 network_list_observers_.RemoveObserver(observer);
567 } 567 }
568 568
569 } // namespace wifi 569 } // namespace wifi
570 570
571 } // namespace local_discovery 571 } // namespace local_discovery
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/notifications/message_center_notification_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698