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 "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "components/mus/public/cpp/property_type_converters.h" | 9 #include "components/mus/public/cpp/property_type_converters.h" |
10 #include "mash/shell/public/interfaces/shell.mojom.h" | 10 #include "mash/shell/public/interfaces/shell.mojom.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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(mojo::Connector* connector, const std::string& url, | 78 void Screenlock::Initialize(mojo::Connector* connector, |
79 const std::string& user_id, uint32_t id) { | 79 const mojo::Identity& identity, |
80 tracing_.Initialize(connector, url); | 80 uint32_t id) { |
| 81 tracing_.Initialize(connector, identity.name()); |
81 | 82 |
82 mash::shell::mojom::ShellPtr mash_shell; | 83 mash::shell::mojom::ShellPtr mash_shell; |
83 connector->ConnectToInterface("mojo:mash_shell", &mash_shell); | 84 connector->ConnectToInterface("mojo:mash_shell", &mash_shell); |
84 mash_shell->AddScreenlockStateListener( | 85 mash_shell->AddScreenlockStateListener( |
85 bindings_.CreateInterfacePtrAndBind(this)); | 86 bindings_.CreateInterfacePtrAndBind(this)); |
86 | 87 |
87 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); | 88 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); |
88 views::WindowManagerConnection::Create(connector); | 89 views::WindowManagerConnection::Create(connector); |
89 | 90 |
90 views::Widget* widget = new views::Widget; | 91 views::Widget* widget = new views::Widget; |
(...skipping 13 matching lines...) Expand all Loading... |
104 widget->Show(); | 105 widget->Show(); |
105 } | 106 } |
106 | 107 |
107 void Screenlock::ScreenlockStateChanged(bool screen_locked) { | 108 void Screenlock::ScreenlockStateChanged(bool screen_locked) { |
108 if (!screen_locked) | 109 if (!screen_locked) |
109 base::MessageLoop::current()->QuitWhenIdle(); | 110 base::MessageLoop::current()->QuitWhenIdle(); |
110 } | 111 } |
111 | 112 |
112 } // namespace screenlock | 113 } // namespace screenlock |
113 } // namespace main | 114 } // namespace main |
OLD | NEW |