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

Unified Diff: chrome/browser/chromeos/dbus/display_power_service_provider.cc

Issue 739123002: Move DisplayPowerServiceProvider to chromeos/dbus/services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/dbus/display_power_service_provider.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/dbus/display_power_service_provider.cc
diff --git a/chrome/browser/chromeos/dbus/display_power_service_provider.cc b/chrome/browser/chromeos/dbus/display_power_service_provider.cc
deleted file mode 100644
index 507e9a72eb1abbed835394e8ebf585811a7609d2..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/dbus/display_power_service_provider.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/dbus/display_power_service_provider.h"
-
-#include "ash/shell.h"
-#include "base/bind.h"
-#include "dbus/bus.h"
-#include "dbus/message.h"
-#include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/display/chromeos/display_configurator.h"
-#include "ui/wm/core/user_activity_detector.h"
-
-namespace chromeos {
-
-DisplayPowerServiceProvider::DisplayPowerServiceProvider()
- : weak_ptr_factory_(this) {
-}
-
-DisplayPowerServiceProvider::~DisplayPowerServiceProvider() {}
-
-void DisplayPowerServiceProvider::Start(
- scoped_refptr<dbus::ExportedObject> exported_object) {
- exported_object->ExportMethod(
- kLibCrosServiceInterface,
- kSetDisplayPower,
- base::Bind(&DisplayPowerServiceProvider::SetDisplayPower,
- weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&DisplayPowerServiceProvider::OnExported,
- weak_ptr_factory_.GetWeakPtr()));
- exported_object->ExportMethod(
- kLibCrosServiceInterface,
- kSetDisplaySoftwareDimming,
- base::Bind(&DisplayPowerServiceProvider::SetDisplaySoftwareDimming,
- weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&DisplayPowerServiceProvider::OnExported,
- weak_ptr_factory_.GetWeakPtr()));
-}
-
-void DisplayPowerServiceProvider::OnExported(const std::string& interface_name,
- const std::string& method_name,
- bool success) {
- if (!success) {
- LOG(ERROR) << "Failed to export " << interface_name << "."
- << method_name;
- }
-}
-
-void DisplayPowerServiceProvider::SetDisplayPower(
- dbus::MethodCall* method_call,
- dbus::ExportedObject::ResponseSender response_sender) {
- dbus::MessageReader reader(method_call);
- int int_state = 0;
- if (reader.PopInt32(&int_state)) {
- // Turning displays off when the device becomes idle or on just before
- // we suspend may trigger a mouse move, which would then be incorrectly
- // reported as user activity. Let the UserActivityDetector
- // know so that it can ignore such events.
- wm::UserActivityDetector::Get()->OnDisplayPowerChanging();
-
- DisplayPowerState state = static_cast<DisplayPowerState>(int_state);
- ash::Shell::GetInstance()->display_configurator()->SetDisplayPower(
- state, ui::DisplayConfigurator::kSetDisplayPowerNoFlags);
- } else {
- LOG(ERROR) << "Unable to parse " << kSetDisplayPower << " request";
- }
-
- response_sender.Run(dbus::Response::FromMethodCall(method_call));
-}
-
-void DisplayPowerServiceProvider::SetDisplaySoftwareDimming(
- dbus::MethodCall* method_call,
- dbus::ExportedObject::ResponseSender response_sender) {
- dbus::MessageReader reader(method_call);
- bool dimmed = false;
- if (reader.PopBool(&dimmed)) {
- ash::Shell::GetInstance()->SetDimming(dimmed);
- } else {
- LOG(ERROR) << "Unable to parse " << kSetDisplaySoftwareDimming
- << " request";
- }
- response_sender.Run(dbus::Response::FromMethodCall(method_call));
-}
-
-} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/dbus/display_power_service_provider.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698