| Index: chrome/browser/ui/webui/options/chromeos/power_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/power_handler.cc b/chrome/browser/ui/webui/options/chromeos/power_handler.cc
|
| index 47f981fdcb2eb39598820801019ae649cda79342..3d7286200096fdca98cd4ae3736b80945ef37121 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/power_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/chromeos/power_handler.cc
|
| @@ -28,10 +28,10 @@ namespace options {
|
|
|
| PowerHandler::PowerHandler() {
|
| // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348
|
| - this->show_power_status_ = !ash_util::IsRunningInMash() &&
|
| - (switches::PowerOverlayEnabled() ||
|
| - (PowerStatus::Get()->IsBatteryPresent() &&
|
| - PowerStatus::Get()->SupportsDualRoleDevices()));
|
| + this->show_power_status_ =
|
| + !IsRunningInMash() && (switches::PowerOverlayEnabled() ||
|
| + (PowerStatus::Get()->IsBatteryPresent() &&
|
| + PowerStatus::Get()->SupportsDualRoleDevices()));
|
| }
|
|
|
| PowerHandler::~PowerHandler() {
|
|
|