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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . 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/main.cc » ('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"
11 #include "mojo/public/cpp/bindings/binding.h" 11 #include "mojo/public/cpp/bindings/binding.h"
12 #include "services/service_manager/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 {
23 namespace { 23 namespace {
24 24
25 class ScreenlockView : public views::WidgetDelegateView, 25 class ScreenlockView : public views::WidgetDelegateView,
26 public views::ButtonListener { 26 public views::ButtonListener {
27 public: 27 public:
28 explicit ScreenlockView(shell::Connector* connector) 28 explicit ScreenlockView(service_manager::Connector* connector)
29 : connector_(connector), 29 : connector_(connector),
30 unlock_button_( 30 unlock_button_(
31 views::MdTextButton::Create(this, base::ASCIIToUTF16("Unlock"))) { 31 views::MdTextButton::Create(this, base::ASCIIToUTF16("Unlock"))) {
32 set_background(views::Background::CreateSolidBackground(SK_ColorYELLOW)); 32 set_background(views::Background::CreateSolidBackground(SK_ColorYELLOW));
33 AddChildView(unlock_button_); 33 AddChildView(unlock_button_);
34 } 34 }
35 ~ScreenlockView() override {} 35 ~ScreenlockView() override {}
36 36
37 private: 37 private:
38 // Overridden from views::WidgetDelegate: 38 // Overridden from views::WidgetDelegate:
(...skipping 16 matching lines...) Expand all
55 } 55 }
56 56
57 // Overridden from views::ButtonListener: 57 // Overridden from views::ButtonListener:
58 void ButtonPressed(views::Button* sender, const ui::Event& event) override { 58 void ButtonPressed(views::Button* sender, const ui::Event& event) override {
59 DCHECK_EQ(sender, unlock_button_); 59 DCHECK_EQ(sender, unlock_button_);
60 mash::session::mojom::SessionPtr session; 60 mash::session::mojom::SessionPtr session;
61 connector_->ConnectToInterface("service:mash_session", &session); 61 connector_->ConnectToInterface("service:mash_session", &session);
62 session->UnlockScreen(); 62 session->UnlockScreen();
63 } 63 }
64 64
65 shell::Connector* connector_; 65 service_manager::Connector* connector_;
66 views::MdTextButton* unlock_button_; 66 views::MdTextButton* unlock_button_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(ScreenlockView); 68 DISALLOW_COPY_AND_ASSIGN(ScreenlockView);
69 }; 69 };
70 70
71 } // namespace 71 } // namespace
72 72
73 Screenlock::Screenlock() {} 73 Screenlock::Screenlock() {}
74 Screenlock::~Screenlock() {} 74 Screenlock::~Screenlock() {}
75 75
76 void Screenlock::OnStart(const shell::Identity& identity) { 76 void Screenlock::OnStart(const service_manager::Identity& identity) {
77 tracing_.Initialize(connector(), identity.name()); 77 tracing_.Initialize(connector(), identity.name());
78 78
79 mash::session::mojom::SessionPtr session; 79 mash::session::mojom::SessionPtr session;
80 connector()->ConnectToInterface("service:mash_session", &session); 80 connector()->ConnectToInterface("service:mash_session", &session);
81 session->AddScreenlockStateListener( 81 session->AddScreenlockStateListener(
82 bindings_.CreateInterfacePtrAndBind(this)); 82 bindings_.CreateInterfacePtrAndBind(this));
83 83
84 aura_init_.reset( 84 aura_init_.reset(
85 new views::AuraInit(connector(), "views_mus_resources.pak")); 85 new views::AuraInit(connector(), "views_mus_resources.pak"));
86 window_manager_connection_ = 86 window_manager_connection_ =
(...skipping 16 matching lines...) Expand all
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
OLDNEW
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/session/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698