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

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

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 "chromeos/network/shill_property_handler.h" 5 #include "chromeos/network/shill_property_handler.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 } else if (type_ == ManagedState::MANAGED_TYPE_DEVICE) { 80 } else if (type_ == ManagedState::MANAGED_TYPE_DEVICE) {
81 DBusThreadManager::Get()->GetShillDeviceClient()-> 81 DBusThreadManager::Get()->GetShillDeviceClient()->
82 RemovePropertyChangedObserver(dbus::ObjectPath(path_), this); 82 RemovePropertyChangedObserver(dbus::ObjectPath(path_), this);
83 } else { 83 } else {
84 NOTREACHED(); 84 NOTREACHED();
85 } 85 }
86 } 86 }
87 87
88 // ShillPropertyChangedObserver overrides. 88 // ShillPropertyChangedObserver overrides.
89 virtual void OnPropertyChanged(const std::string& key, 89 virtual void OnPropertyChanged(const std::string& key,
90 const base::Value& value) OVERRIDE { 90 const base::Value& value) override {
91 handler_.Run(type_, path_, key, value); 91 handler_.Run(type_, path_, key, value);
92 } 92 }
93 93
94 private: 94 private:
95 ManagedState::ManagedType type_; 95 ManagedState::ManagedType type_;
96 std::string path_; 96 std::string path_;
97 Handler handler_; 97 Handler handler_;
98 98
99 DISALLOW_COPY_AND_ASSIGN(ShillPropertyObserver); 99 DISALLOW_COPY_AND_ASSIGN(ShillPropertyObserver);
100 }; 100 };
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 base::StringPrintf("Failed to get IP Config properties: %s: %d", 526 base::StringPrintf("Failed to get IP Config properties: %s: %d",
527 ip_config_path.c_str(), call_status), path); 527 ip_config_path.c_str(), call_status), path);
528 return; 528 return;
529 } 529 }
530 NET_LOG_EVENT("IP Config properties received", path); 530 NET_LOG_EVENT("IP Config properties received", path);
531 listener_->UpdateIPConfigProperties(type, path, ip_config_path, properties); 531 listener_->UpdateIPConfigProperties(type, path, ip_config_path, properties);
532 } 532 }
533 533
534 } // namespace internal 534 } // namespace internal
535 } // namespace chromeos 535 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/shill_property_handler.h ('k') | chromeos/network/shill_property_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698