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

Side by Side Diff: net/base/network_config_watcher_mac.cc

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
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 "net/base/network_config_watcher_mac.h" 5 #include "net/base/network_config_watcher_mac.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 17 matching lines...) Expand all
28 } 28 }
29 #endif // !defined(OS_IOS) 29 #endif // !defined(OS_IOS)
30 30
31 class NetworkConfigWatcherMacThread : public base::Thread { 31 class NetworkConfigWatcherMacThread : public base::Thread {
32 public: 32 public:
33 NetworkConfigWatcherMacThread(NetworkConfigWatcherMac::Delegate* delegate); 33 NetworkConfigWatcherMacThread(NetworkConfigWatcherMac::Delegate* delegate);
34 virtual ~NetworkConfigWatcherMacThread(); 34 virtual ~NetworkConfigWatcherMacThread();
35 35
36 protected: 36 protected:
37 // base::Thread 37 // base::Thread
38 virtual void Init() OVERRIDE; 38 virtual void Init() override;
39 virtual void CleanUp() OVERRIDE; 39 virtual void CleanUp() override;
40 40
41 private: 41 private:
42 // The SystemConfiguration calls in this function can lead to contention early 42 // The SystemConfiguration calls in this function can lead to contention early
43 // on, so we invoke this function later on in startup to keep it fast. 43 // on, so we invoke this function later on in startup to keep it fast.
44 void InitNotifications(); 44 void InitNotifications();
45 45
46 base::ScopedCFTypeRef<CFRunLoopSourceRef> run_loop_source_; 46 base::ScopedCFTypeRef<CFRunLoopSourceRef> run_loop_source_;
47 NetworkConfigWatcherMac::Delegate* const delegate_; 47 NetworkConfigWatcherMac::Delegate* const delegate_;
48 base::WeakPtrFactory<NetworkConfigWatcherMacThread> weak_factory_; 48 base::WeakPtrFactory<NetworkConfigWatcherMacThread> weak_factory_;
49 49
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // We create this notifier thread because the notification implementation 123 // We create this notifier thread because the notification implementation
124 // needs a thread with a CFRunLoop, and there's no guarantee that 124 // needs a thread with a CFRunLoop, and there's no guarantee that
125 // MessageLoop::current() meets that criterion. 125 // MessageLoop::current() meets that criterion.
126 base::Thread::Options thread_options(base::MessageLoop::TYPE_UI, 0); 126 base::Thread::Options thread_options(base::MessageLoop::TYPE_UI, 0);
127 notifier_thread_->StartWithOptions(thread_options); 127 notifier_thread_->StartWithOptions(thread_options);
128 } 128 }
129 129
130 NetworkConfigWatcherMac::~NetworkConfigWatcherMac() {} 130 NetworkConfigWatcherMac::~NetworkConfigWatcherMac() {}
131 131
132 } // namespace net 132 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698