mash/screenlock/screenlock.cc - Issue 2419723002: Move services/shell to services/service_manager

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: mash/screenlock/screenlock.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 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 | « mash/screenlock/screenlock.h ('k') | mash/session/BUILD.gn » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 "mash/screenlock/screenlock.h"	5 #include "mash/screenlock/screenlock.h"

6	6

7 #include "ash/public/interfaces/container.mojom.h"	7 #include "ash/public/interfaces/container.mojom.h"

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "mash/session/public/interfaces/session.mojom.h"	10 #include "mash/session/public/interfaces/session.mojom.h"

11 #include "mojo/public/cpp/bindings/binding.h"	11 #include "mojo/public/cpp/bindings/binding.h"

12 #include "services/shell/public/cpp/connector.h"	12 #include "services/service_manager/public/cpp/connector.h"

13 #include "services/ui/public/cpp/property_type_converters.h"	13 #include "services/ui/public/cpp/property_type_converters.h"

14 #include "ui/views/background.h"	14 #include "ui/views/background.h"

15 #include "ui/views/controls/button/md_text_button.h"	15 #include "ui/views/controls/button/md_text_button.h"

16 #include "ui/views/mus/aura_init.h"	16 #include "ui/views/mus/aura_init.h"

17 #include "ui/views/mus/native_widget_mus.h"	17 #include "ui/views/mus/native_widget_mus.h"

18 #include "ui/views/mus/window_manager_connection.h"	18 #include "ui/views/mus/window_manager_connection.h"

19 #include "ui/views/widget/widget_delegate.h"	19 #include "ui/views/widget/widget_delegate.h"

20	20

21 namespace mash {	21 namespace mash {

22 namespace screenlock {	22 namespace screenlock {

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 widget->Show();	103 widget->Show();

104 }	104 }

105	105

106 void Screenlock::ScreenlockStateChanged(bool screen_locked) {	106 void Screenlock::ScreenlockStateChanged(bool screen_locked) {

107 if (!screen_locked)	107 if (!screen_locked)

108 base::MessageLoop::current()->QuitWhenIdle();	108 base::MessageLoop::current()->QuitWhenIdle();

109 }	109 }

110	110

111 } // namespace screenlock	111 } // namespace screenlock

112 } // namespace mash	112 } // namespace mash

OLD	NEW