diff options
author | Alex Vakulenko <avakulenko@google.com> | 2015-10-13 10:00:34 -0700 |
---|---|---|
committer | Alex Vakulenko <avakulenko@google.com> | 2015-10-13 12:24:43 -0700 |
commit | 78132a0e300173bf3b738c9caf30f3941ff31cd2 (patch) | |
tree | c1910b89269243065c83590e078d1629c1da6578 | |
parent | cedc609e56b85c85749fa1fecf385c51ee793505 (diff) | |
download | nativepower-78132a0e300173bf3b738c9caf30f3941ff31cd2.tar.gz |
nativepower: Rename "chromeos" -> "brillo" in include paths and namespaces
libchromeos is transitioning to libbrillo and chromeos namespaces
and include directory is changing to brillo.
Bug: 24872993
TEST=dragonboard builds & launches
unit tests for nativepowerman_tests and libnativepower_tests pass
Change-Id: If77ddddd4740cea828fb343a1dbdc007c61b6b52
-rw-r--r-- | daemon/main.cc | 16 | ||||
-rw-r--r-- | example/power_example.cc | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/daemon/main.cc b/daemon/main.cc index 0458441..479d86f 100644 --- a/daemon/main.cc +++ b/daemon/main.cc @@ -19,23 +19,23 @@ #include <base/logging.h> #include <base/macros.h> #include <binderwrapper/binder_wrapper.h> -#include <chromeos/binder_watcher.h> -#include <chromeos/daemons/daemon.h> -#include <chromeos/flag_helper.h> +#include <brillo/binder_watcher.h> +#include <brillo/daemons/daemon.h> +#include <brillo/flag_helper.h> #include "power_manager.h" namespace { -class PowerManagerDaemon : public chromeos::Daemon { +class PowerManagerDaemon : public brillo::Daemon { public: PowerManagerDaemon() = default; ~PowerManagerDaemon() override = default; private: - // chromeos::Daemon: + // brillo::Daemon: int OnInit() override { - int result = chromeos::Daemon::OnInit(); + int result = brillo::Daemon::OnInit(); if (result != EX_OK) return result; @@ -49,7 +49,7 @@ class PowerManagerDaemon : public chromeos::Daemon { return EX_OK; } - chromeos::BinderWatcher binder_watcher_; + brillo::BinderWatcher binder_watcher_; android::PowerManager power_manager_; DISALLOW_COPY_AND_ASSIGN(PowerManagerDaemon); @@ -59,7 +59,7 @@ class PowerManagerDaemon : public chromeos::Daemon { int main(int argc, char *argv[]) { // This also initializes base::CommandLine(), which is needed for logging. - chromeos::FlagHelper::Init(argc, argv, "Power management daemon"); + brillo::FlagHelper::Init(argc, argv, "Power management daemon"); logging::InitLogging(logging::LoggingSettings()); return PowerManagerDaemon().Run(); } diff --git a/example/power_example.cc b/example/power_example.cc index 2964c44..efe27a5 100644 --- a/example/power_example.cc +++ b/example/power_example.cc @@ -24,7 +24,7 @@ #include <base/sys_info.h> #include <base/time/time.h> #include <binderwrapper/binder_wrapper.h> -#include <chromeos/flag_helper.h> +#include <brillo/flag_helper.h> #include <nativepower/power_manager_client.h> #include <nativepower/wake_lock.h> @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) { "Action to perform (\"reboot\", \"shut_down\", \"suspend\", " "\"wake_lock\")"); - chromeos::FlagHelper::Init(argc, argv, "Example power-management client."); + brillo::FlagHelper::Init(argc, argv, "Example power-management client."); logging::InitLogging(logging::LoggingSettings()); base::AtExitManager at_exit; base::MessageLoopForIO loop; |