chrome/browser/chromeos/dbus/display_power_service_provider.cc - Issue 222383002: Move UserActivityDetector from ash/wm/ to ui/wm/core/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/dbus/display_power_service_provider.cc

Issue 222383002: Move UserActivityDetector from ash/wm/ to ui/wm/core/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove an unneeded include Created 6 years, 8 months 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 | Annotate | Revision Log

« ash/system/chromeos/power/user_activity_notifier.h ('K') | « chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc ('k') | chrome/browser/chromeos/idle_detector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 "chrome/browser/chromeos/dbus/display_power_service_provider.h"	5 #include "chrome/browser/chromeos/dbus/display_power_service_provider.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/wm/user_activity_detector.h"

9 #include "base/bind.h"	8 #include "base/bind.h"

10 #include "dbus/bus.h"	9 #include "dbus/bus.h"

11 #include "dbus/message.h"	10 #include "dbus/message.h"

12 #include "third_party/cros_system_api/dbus/service_constants.h"	11 #include "third_party/cros_system_api/dbus/service_constants.h"

13 #include "ui/display/chromeos/output_configurator.h"	12 #include "ui/display/chromeos/output_configurator.h"

	13 #include "ui/wm/core/user_activity_detector.h"

14	14

15 namespace chromeos {	15 namespace chromeos {

16	16

17 DisplayPowerServiceProvider::DisplayPowerServiceProvider()	17 DisplayPowerServiceProvider::DisplayPowerServiceProvider()

18 : weak_ptr_factory_(this) {	18 : weak_ptr_factory_(this) {

19 }	19 }

20	20

21 DisplayPowerServiceProvider::~DisplayPowerServiceProvider() {}	21 DisplayPowerServiceProvider::~DisplayPowerServiceProvider() {}

22	22

23 void DisplayPowerServiceProvider::Start(	23 void DisplayPowerServiceProvider::Start(

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 if (reader.PopBool(&dimmed)) {	78 if (reader.PopBool(&dimmed)) {

79 ash::Shell::GetInstance()->SetDimming(dimmed);	79 ash::Shell::GetInstance()->SetDimming(dimmed);

80 } else {	80 } else {

81 LOG(ERROR) << "Unable to parse " << kSetDisplaySoftwareDimming	81 LOG(ERROR) << "Unable to parse " << kSetDisplaySoftwareDimming

82 << " request";	82 << " request";

83 }	83 }

84 response_sender.Run(dbus::Response::FromMethodCall(method_call));	84 response_sender.Run(dbus::Response::FromMethodCall(method_call));

85 }	85 }

86	86

87 } // namespace chromeos	87 } // namespace chromeos

OLD	NEW