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

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

Issue 2118083002: ShellClient -> Service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus2
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/screenlock.h ('k') | mash/session/session.h » ('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 "mash/session/public/interfaces/session.mojom.h" 10 #include "mash/session/public/interfaces/session.mojom.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 views::LabelButton* unlock_button_; 68 views::LabelButton* unlock_button_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(ScreenlockView); 70 DISALLOW_COPY_AND_ASSIGN(ScreenlockView);
71 }; 71 };
72 72
73 } // namespace 73 } // namespace
74 74
75 Screenlock::Screenlock() {} 75 Screenlock::Screenlock() {}
76 Screenlock::~Screenlock() {} 76 Screenlock::~Screenlock() {}
77 77
78 void Screenlock::Initialize(shell::Connector* connector, 78 void Screenlock::OnStart(shell::Connector* connector,
79 const shell::Identity& identity, 79 const shell::Identity& identity,
80 uint32_t id) { 80 uint32_t id) {
81 tracing_.Initialize(connector, identity.name()); 81 tracing_.Initialize(connector, identity.name());
82 82
83 mash::session::mojom::SessionPtr session; 83 mash::session::mojom::SessionPtr session;
84 connector->ConnectToInterface("mojo:mash_session", &session); 84 connector->ConnectToInterface("mojo:mash_session", &session);
85 session->AddScreenlockStateListener( 85 session->AddScreenlockStateListener(
86 bindings_.CreateInterfacePtrAndBind(this)); 86 bindings_.CreateInterfacePtrAndBind(this));
87 87
88 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); 88 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
89 window_manager_connection_ = 89 window_manager_connection_ =
90 views::WindowManagerConnection::Create(connector, identity); 90 views::WindowManagerConnection::Create(connector, identity);
(...skipping 15 matching lines...) Expand all
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/screenlock.h ('k') | mash/session/session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698