ash/common/system/date/date_default_view.cc - Issue 2319783002: mash: Allow a subset of D-Bus clients to be created in DBusThreadManager

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/common/system/date/date_default_view.cc

Issue 2319783002: mash: Allow a subset of D-Bus clients to be created in DBusThreadManager (Closed)

Patch Set: WIP, add DBusThreadManagerAsh and DBusThreadManagerChrome Created 4 years, 3 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:

Index: ash/common/system/date/date_default_view.cc

diff --git a/ash/common/system/date/date_default_view.cc b/ash/common/system/date/date_default_view.cc

index 35eddfb5a4b05410e64cb15f54942899e8e97a03..f59c72a4d7d4c5eacc826ea756c28ed3a0446a65 100644

--- a/ash/common/system/date/date_default_view.cc

+++ b/ash/common/system/date/date_default_view.cc

@@ -22,7 +22,8 @@

#include "ui/views/view.h"

#if defined(OS_CHROMEOS)

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

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

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

#include "chromeos/dbus/session_manager_client.h"

#endif

@@ -142,7 +143,7 @@ void DateDefaultView::ButtonPressed(views::Button* sender,

} else if (sender == lock_button_) {

shell->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN);

#if defined(OS_CHROMEOS)

- chromeos::DBusThreadManager::Get()

+ DBusThreadManagerAsh::Get()

->GetSessionManagerClient()

->RequestLockScreen();

#endif