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

Unified Diff: ui/base/user_activity/user_activity_detector.cc

Issue 1676713002: ash/mash: Add a mus-client that sets up ash to provide the system ui for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix-cros-build Created 4 years, 10 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
« no previous file with comments | « mash/shell/shell_application_delegate.cc ('k') | ui/views/mus/native_widget_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/user_activity/user_activity_detector.cc
diff --git a/ui/base/user_activity/user_activity_detector.cc b/ui/base/user_activity/user_activity_detector.cc
index bffe4796c9e1981587271c965b3d2eb3546a8d2d..4f04b8623b78604fc473b827a352901cf1e9f460 100644
--- a/ui/base/user_activity/user_activity_detector.cc
+++ b/ui/base/user_activity/user_activity_detector.cc
@@ -53,9 +53,7 @@ UserActivityDetector::UserActivityDetector() {
ui::PlatformEventSource* platform_event_source =
ui::PlatformEventSource::GetInstance();
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- CHECK(platform_event_source);
-#endif
+ // TODO(sad): Need a PES for mus.
if (platform_event_source)
platform_event_source->AddPlatformEventObserver(this);
}
@@ -63,9 +61,6 @@ UserActivityDetector::UserActivityDetector() {
UserActivityDetector::~UserActivityDetector() {
ui::PlatformEventSource* platform_event_source =
ui::PlatformEventSource::GetInstance();
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- CHECK(platform_event_source);
-#endif
if (platform_event_source)
platform_event_source->RemovePlatformEventObserver(this);
g_instance = nullptr;
« no previous file with comments | « mash/shell/shell_application_delegate.cc ('k') | ui/views/mus/native_widget_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698