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

Side by Side Diff: chromeos/dbus/update_engine_client.cc

Issue 697953002: ObserverList::HasObserver now takes a const pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile errors (ChromeOS unit tests). Created 6 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
« no previous file with comments | « chromeos/dbus/update_engine_client.h ('k') | components/invalidation/invalidation_logger.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 (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/dbus/update_engine_client.h" 5 #include "chromeos/dbus/update_engine_client.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 // UpdateEngineClient implementation: 92 // UpdateEngineClient implementation:
93 virtual void AddObserver(Observer* observer) override { 93 virtual void AddObserver(Observer* observer) override {
94 observers_.AddObserver(observer); 94 observers_.AddObserver(observer);
95 } 95 }
96 96
97 virtual void RemoveObserver(Observer* observer) override { 97 virtual void RemoveObserver(Observer* observer) override {
98 observers_.RemoveObserver(observer); 98 observers_.RemoveObserver(observer);
99 } 99 }
100 100
101 virtual bool HasObserver(Observer* observer) override { 101 virtual bool HasObserver(const Observer* observer) const override {
102 return observers_.HasObserver(observer); 102 return observers_.HasObserver(observer);
103 } 103 }
104 104
105 virtual void RequestUpdateCheck( 105 virtual void RequestUpdateCheck(
106 const UpdateCheckCallback& callback) override { 106 const UpdateCheckCallback& callback) override {
107 dbus::MethodCall method_call( 107 dbus::MethodCall method_call(
108 update_engine::kUpdateEngineInterface, 108 update_engine::kUpdateEngineInterface,
109 update_engine::kAttemptUpdate); 109 update_engine::kAttemptUpdate);
110 dbus::MessageWriter writer(&method_call); 110 dbus::MessageWriter writer(&method_call);
111 writer.AppendString(""); // Unused. 111 writer.AppendString(""); // Unused.
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 class UpdateEngineClientStubImpl : public UpdateEngineClient { 405 class UpdateEngineClientStubImpl : public UpdateEngineClient {
406 public: 406 public:
407 UpdateEngineClientStubImpl() 407 UpdateEngineClientStubImpl()
408 : current_channel_(kReleaseChannelBeta), 408 : current_channel_(kReleaseChannelBeta),
409 target_channel_(kReleaseChannelBeta) {} 409 target_channel_(kReleaseChannelBeta) {}
410 410
411 // UpdateEngineClient implementation: 411 // UpdateEngineClient implementation:
412 virtual void Init(dbus::Bus* bus) override {} 412 virtual void Init(dbus::Bus* bus) override {}
413 virtual void AddObserver(Observer* observer) override {} 413 virtual void AddObserver(Observer* observer) override {}
414 virtual void RemoveObserver(Observer* observer) override {} 414 virtual void RemoveObserver(Observer* observer) override {}
415 virtual bool HasObserver(Observer* observer) override { return false; } 415 virtual bool HasObserver(const Observer* observer) const override {
416 return false;
417 }
416 418
417 virtual void RequestUpdateCheck( 419 virtual void RequestUpdateCheck(
418 const UpdateCheckCallback& callback) override { 420 const UpdateCheckCallback& callback) override {
419 callback.Run(UPDATE_RESULT_NOTIMPLEMENTED); 421 callback.Run(UPDATE_RESULT_NOTIMPLEMENTED);
420 } 422 }
421 virtual void RebootAfterUpdate() override {} 423 virtual void RebootAfterUpdate() override {}
422 virtual void Rollback() override {} 424 virtual void Rollback() override {}
423 virtual void CanRollbackCheck( 425 virtual void CanRollbackCheck(
424 const RollbackCheckCallback& callback) override { 426 const RollbackCheckCallback& callback) override {
425 callback.Run(true); 427 callback.Run(true);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 virtual void AddObserver(Observer* observer) override { 462 virtual void AddObserver(Observer* observer) override {
461 if (observer) 463 if (observer)
462 observers_.AddObserver(observer); 464 observers_.AddObserver(observer);
463 } 465 }
464 466
465 virtual void RemoveObserver(Observer* observer) override { 467 virtual void RemoveObserver(Observer* observer) override {
466 if (observer) 468 if (observer)
467 observers_.RemoveObserver(observer); 469 observers_.RemoveObserver(observer);
468 } 470 }
469 471
470 virtual bool HasObserver(Observer* observer) override { 472 virtual bool HasObserver(const Observer* observer) const override {
471 return observers_.HasObserver(observer); 473 return observers_.HasObserver(observer);
472 } 474 }
473 475
474 virtual void RequestUpdateCheck( 476 virtual void RequestUpdateCheck(
475 const UpdateCheckCallback& callback) override { 477 const UpdateCheckCallback& callback) override {
476 if (last_status_.status != UPDATE_STATUS_IDLE) { 478 if (last_status_.status != UPDATE_STATUS_IDLE) {
477 callback.Run(UPDATE_RESULT_FAILED); 479 callback.Run(UPDATE_RESULT_FAILED);
478 return; 480 return;
479 } 481 }
480 callback.Run(UPDATE_RESULT_SUCCESS); 482 callback.Run(UPDATE_RESULT_SUCCESS);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 auto cix = std::find(kReleaseChannelsList, 577 auto cix = std::find(kReleaseChannelsList,
576 kReleaseChannelsList + arraysize(kReleaseChannelsList), 578 kReleaseChannelsList + arraysize(kReleaseChannelsList),
577 current_channel); 579 current_channel);
578 auto tix = std::find(kReleaseChannelsList, 580 auto tix = std::find(kReleaseChannelsList,
579 kReleaseChannelsList + arraysize(kReleaseChannelsList), 581 kReleaseChannelsList + arraysize(kReleaseChannelsList),
580 target_channel); 582 target_channel);
581 return tix > cix; 583 return tix > cix;
582 } 584 }
583 585
584 } // namespace chromeos 586 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/update_engine_client.h ('k') | components/invalidation/invalidation_logger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698