chrome/browser/chromeos/power/power_button_observer.cc - Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common

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/power/power_button_observer.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « chrome/browser/chromeos/login/signin/merge_session_load_page.cc ('k') | chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc » ('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) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/power/power_button_observer.h"	5 #include "chrome/browser/chromeos/power/power_button_observer.h"

6	6

	7 #include "ash/common/system/tray/system_tray_delegate.h"

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

8 #include "ash/system/tray/system_tray_delegate.h"

9 #include "ash/system/user/login_status.h"	9 #include "ash/system/user/login_status.h"

10 #include "ash/wm/power_button_controller.h"	10 #include "ash/wm/power_button_controller.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "chrome/browser/chrome_notification_types.h"	12 #include "chrome/browser/chrome_notification_types.h"

13 #include "chrome/browser/chromeos/login/lock/screen_locker.h"	13 #include "chrome/browser/chromeos/login/lock/screen_locker.h"

14 #include "chrome/browser/chromeos/power/session_state_controller_delegate_chrome os.h"	14 #include "chrome/browser/chromeos/power/session_state_controller_delegate_chrome os.h"

15 #include "chromeos/dbus/dbus_thread_manager.h"	15 #include "chromeos/dbus/dbus_thread_manager.h"

16 #include "content/public/browser/notification_service.h"	16 #include "content/public/browser/notification_service.h"

17	17

18 namespace ash {	18 namespace ash {

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 }	96 }

97 }	97 }

98	98

99 void PowerButtonObserver::PowerButtonEventReceived(	99 void PowerButtonObserver::PowerButtonEventReceived(

100 bool down, const base::TimeTicks& timestamp) {	100 bool down, const base::TimeTicks& timestamp) {

101 ash::Shell::GetInstance()->power_button_controller()->	101 ash::Shell::GetInstance()->power_button_controller()->

102 OnPowerButtonEvent(down, timestamp);	102 OnPowerButtonEvent(down, timestamp);

103 }	103 }

104	104

105 } // namespace chromeos	105 } // namespace chromeos

OLD	NEW