diff --git a/src/ledflasher/ledflasher.cc b/src/ledflasher/ledflasher.cc index 679c04a75dc4e3e116b465792749275ed873bb5e..3c5fed18f94da74716016720e8658e537aa17326 100644 --- a/src/ledflasher/ledflasher.cc +++ b/src/ledflasher/ledflasher.cc @@ -20,8 +20,8 @@ #include <base/bind.h> #include <base/command_line.h> #include <base/macros.h> -#include <chromeos/daemons/dbus_daemon.h> -#include <chromeos/syslog_logging.h> +#include <brillo/daemons/dbus_daemon.h> +#include <brillo/syslog_logging.h> #include <libweaved/device.h> #include "animation.h" @@ -29,7 +29,7 @@ using com::android::LEDService::ServiceProxy; -class Daemon final : public chromeos::DBusDaemon { +class Daemon final : public brillo::DBusDaemon { public: Daemon() = default; @@ -67,7 +67,7 @@ class Daemon final : public chromeos::DBusDaemon { }; int Daemon::OnInit() { - int return_code = chromeos::DBusDaemon::OnInit(); + int return_code = brillo::DBusDaemon::OnInit(); if (return_code != EX_OK) return return_code; @@ -116,7 +116,7 @@ void Daemon::OnSet(const std::weak_ptr<weaved::Command>& cmd) { int index = command->GetParameter<int>("_led"); CHECK_GT(index, 0); bool on = command->GetParameter<bool>("_on"); - chromeos::ErrorPtr error; + brillo::ErrorPtr error; if (!led_service_->SetLED(index - 1, on, &error)) { CHECK(command->Abort(error->GetCode(), error->GetMessage(), nullptr)); return; @@ -141,7 +141,7 @@ void Daemon::OnToggle(const std::weak_ptr<weaved::Command>& cmd) { CHECK_GT(index, 0); index--; bool on = false; - chromeos::ErrorPtr error; + brillo::ErrorPtr error; if(!led_service_->GetLED(index, &on, &error) || !led_service_->SetLED(index, !on, &error)) { CHECK(command->Abort(error->GetCode(), error->GetMessage(), nullptr)); @@ -185,7 +185,7 @@ void Daemon::UpdateDeviceState() { if (!led_service_->GetAllLEDs(&leds, nullptr)) return; - chromeos::VariantDictionary state_change{ + brillo::VariantDictionary state_change{ {"_ledflasher._status", status_}, {"_ledflasher._leds", leds}, }; @@ -194,8 +194,7 @@ void Daemon::UpdateDeviceState() { int main(int argc, char* argv[]) { base::CommandLine::Init(argc, argv); - chromeos::InitLog(chromeos::kLogToSyslog | - chromeos::kLogHeader); + brillo::InitLog(brillo::kLogToSyslog | brillo::kLogHeader); Daemon daemon; return daemon.Run(); } diff --git a/src/ledservice/dbus_service.cc b/src/ledservice/dbus_service.cc index 390c3fa85c46f2b409a2b74c8b312f2543c917b5..5e9aad8260af7ad612b702e968d7791d7c97b1b6 100644 --- a/src/ledservice/dbus_service.cc +++ b/src/ledservice/dbus_service.cc @@ -17,12 +17,12 @@ #include "dbus_service.h" DBusService::DBusService( - chromeos::dbus_utils::ExportedObjectManager* object_manager) + brillo::dbus_utils::ExportedObjectManager* object_manager) : dbus_object_(object_manager, object_manager->GetBus(), com::android::LEDService::ServiceAdaptor::GetObjectPath()) { } -void DBusService::Start(chromeos::dbus_utils::AsyncEventSequencer* sequencer) { +void DBusService::Start(brillo::dbus_utils::AsyncEventSequencer* sequencer) { dbus_adaptor_.RegisterWithDBusObject(&dbus_object_); dbus_object_.RegisterAsync( sequencer->GetHandler("DBusService::Start failed", true)); diff --git a/src/ledservice/dbus_service.h b/src/ledservice/dbus_service.h index 7526c3dffb2a883122721777b2a508ec860777d2..61511922ea657d1dc2e44700ee7d9e656910fa93 100644 --- a/src/ledservice/dbus_service.h +++ b/src/ledservice/dbus_service.h @@ -27,9 +27,9 @@ class DBusService final : public com::android::LEDService::ServiceInterface { public: explicit DBusService( - chromeos::dbus_utils::ExportedObjectManager* object_manager); + brillo::dbus_utils::ExportedObjectManager* object_manager); - void Start(chromeos::dbus_utils::AsyncEventSequencer* sequencer); + void Start(brillo::dbus_utils::AsyncEventSequencer* sequencer); private: void SetLED(int32_t led, bool on) override; @@ -37,7 +37,7 @@ class DBusService final : public com::android::LEDService::ServiceInterface { std::vector<bool> GetAllLEDs() override; com::android::LEDService::ServiceAdaptor dbus_adaptor_{this}; - chromeos::dbus_utils::DBusObject dbus_object_; + brillo::dbus_utils::DBusObject dbus_object_; LedStatus leds_; DISALLOW_COPY_AND_ASSIGN(DBusService); diff --git a/src/ledservice/ledservice.cc b/src/ledservice/ledservice.cc index e638f87c56a9d31e15be26760a5287c3499cfc23..894820ff6541ab70ae77a74a8421c7fc694edbfb 100644 --- a/src/ledservice/ledservice.cc +++ b/src/ledservice/ledservice.cc @@ -20,12 +20,12 @@ #include <base/bind.h> #include <base/command_line.h> #include <base/macros.h> -#include <chromeos/daemons/dbus_daemon.h> -#include <chromeos/syslog_logging.h> +#include <brillo/daemons/dbus_daemon.h> +#include <brillo/syslog_logging.h> #include "dbus_service.h" -using chromeos::dbus_utils::AsyncEventSequencer; +using brillo::dbus_utils::AsyncEventSequencer; namespace { @@ -34,7 +34,7 @@ const char kRootServicePath[] = "/com/android/LEDService"; } // anonymous namespace -class Daemon final : public chromeos::DBusServiceDaemon { +class Daemon final : public brillo::DBusServiceDaemon { public: Daemon() : DBusServiceDaemon(kServiceName, kRootServicePath) {} @@ -52,8 +52,7 @@ class Daemon final : public chromeos::DBusServiceDaemon { int main(int argc, char* argv[]) { base::CommandLine::Init(argc, argv); - chromeos::InitLog(chromeos::kLogToSyslog | - chromeos::kLogHeader); + brillo::InitLog(brillo::kLogToSyslog | brillo::kLogHeader); Daemon daemon; return daemon.Run(); } diff --git a/src/ledservice/ledstatus.cc b/src/ledservice/ledstatus.cc index e2a17fe6026a95bdabb1446542762c5446edac20..5fac42cd62636d13e71dd4a4680f9b9ad6815074 100644 --- a/src/ledservice/ledstatus.cc +++ b/src/ledservice/ledstatus.cc @@ -24,12 +24,12 @@ #include <base/strings/stringprintf.h> #include <base/strings/string_number_conversions.h> #include <base/strings/string_util.h> -#include <chromeos/streams/file_stream.h> -#include <chromeos/streams/stream_utils.h> +#include <brillo/streams/file_stream.h> +#include <brillo/streams/stream_utils.h> namespace { -chromeos::StreamPtr GetLEDDataStream(size_t index, bool write) { +brillo::StreamPtr GetLEDDataStream(size_t index, bool write) { CHECK(index < LedStatus::num_leds); std::string led_path; if( index == 3 ) { @@ -39,9 +39,9 @@ chromeos::StreamPtr GetLEDDataStream(size_t index, bool write) { index + 1); } base::FilePath dev_path{led_path}; - auto access_mode = chromeos::stream_utils::MakeAccessMode(!write, write); - return chromeos::FileStream::Open( - dev_path, access_mode, chromeos::FileStream::Disposition::OPEN_EXISTING, + auto access_mode = brillo::stream_utils::MakeAccessMode(!write, write); + return brillo::FileStream::Open( + dev_path, access_mode, brillo::FileStream::Disposition::OPEN_EXISTING, nullptr); } @@ -55,7 +55,7 @@ std::vector<bool> LedStatus::GetStatus() const { } bool LedStatus::IsLedOn(size_t index) const { - chromeos::StreamPtr stream = GetLEDDataStream(index, false); + brillo::StreamPtr stream = GetLEDDataStream(index, false); if (!stream) return false; @@ -75,7 +75,7 @@ bool LedStatus::IsLedOn(size_t index) const { } void LedStatus::SetLedStatus(size_t index, bool on) { - chromeos::StreamPtr stream = GetLEDDataStream(index, true); + brillo::StreamPtr stream = GetLEDDataStream(index, true); if (!stream) return;