ash/system/chromeos/power/power_event_observer.cc - Issue 2064953002: mash: Migrate tray date view to //ash/common types

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

Unified Diff: ash/system/chromeos/power/power_event_observer.cc

Issue 2064953002: mash: Migrate tray date view to //ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayviews

Patch Set: review feedback 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 side-by-side diff with in-line comments

Download patch

Index: ash/system/chromeos/power/power_event_observer.cc

diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc

index 96431a72110750cd77a6d2c2a39183f7640dc050..fdcf71254f28163489d5a591c9756e8efc5c5a51 100644

--- a/ash/system/chromeos/power/power_event_observer.cc

+++ b/ash/system/chromeos/power/power_event_observer.cc

@@ -5,8 +5,9 @@

#include "ash/system/chromeos/power/power_event_observer.h"

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/system/tray/wm_system_tray_notifier.h"

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

-#include "ash/system/tray/system_tray_notifier.h"

#include "ash/wm/power_button_controller.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "ui/aura/window.h"

@@ -125,7 +126,7 @@ void PowerEventObserver::SuspendImminent() {

void PowerEventObserver::SuspendDone(const base::TimeDelta& sleep_duration) {

Shell::GetInstance()->display_configurator()->ResumeDisplays();

- Shell::GetInstance()->system_tray_notifier()->NotifyRefreshClock();

+ WmShell::Get()->system_tray_notifier()->NotifyRefreshClock();

// If the suspend request was being blocked while waiting for the lock

// animation to complete, clear the blocker since the suspend has already

« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/system/chromeos/system_clock_observer.cc » ('j') | no next file with comments »