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

Side by Side Diff: mash/screenlock/screenlock.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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/BUILD.gn ('k') | mash/task_viewer/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "components/mus/public/cpp/property_type_converters.h"
11 #include "mash/session/public/interfaces/session.mojom.h" 10 #include "mash/session/public/interfaces/session.mojom.h"
12 #include "mojo/public/cpp/bindings/binding.h" 11 #include "mojo/public/cpp/bindings/binding.h"
13 #include "services/shell/public/cpp/connector.h" 12 #include "services/shell/public/cpp/connector.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/label_button.h" 15 #include "ui/views/controls/button/label_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 {
23 namespace { 23 namespace {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 widget->Show(); 106 widget->Show();
107 } 107 }
108 108
109 void Screenlock::ScreenlockStateChanged(bool screen_locked) { 109 void Screenlock::ScreenlockStateChanged(bool screen_locked) {
110 if (!screen_locked) 110 if (!screen_locked)
111 base::MessageLoop::current()->QuitWhenIdle(); 111 base::MessageLoop::current()->QuitWhenIdle();
112 } 112 }
113 113
114 } // namespace screenlock 114 } // namespace screenlock
115 } // namespace mash 115 } // namespace mash
OLDNEW
« no previous file with comments | « mash/screenlock/BUILD.gn ('k') | mash/task_viewer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698