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

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

Issue 2026623002: views/mus: Have explicit ownership of views::WindowManagerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 6 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/task_viewer/task_viewer.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 "components/mus/public/cpp/property_type_converters.h" 10 #include "components/mus/public/cpp/property_type_converters.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 views::WindowManagerConnection::Create(connector, identity); 89 window_manager_connection_ =
90 views::WindowManagerConnection::Create(connector, identity);
90 91
91 views::Widget* widget = new views::Widget; 92 views::Widget* widget = new views::Widget;
92 views::Widget::InitParams params( 93 views::Widget::InitParams params(
93 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 94 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
94 params.delegate = new ScreenlockView(connector); 95 params.delegate = new ScreenlockView(connector);
95 96
96 std::map<std::string, std::vector<uint8_t>> properties; 97 std::map<std::string, std::vector<uint8_t>> properties;
97 properties[ash::mojom::kWindowContainer_Property] = 98 properties[ash::mojom::kWindowContainer_Property] =
98 mojo::ConvertTo<std::vector<uint8_t>>( 99 mojo::ConvertTo<std::vector<uint8_t>>(
99 static_cast<int32_t>(ash::mojom::Container::LOGIN_WINDOWS)); 100 static_cast<int32_t>(ash::mojom::Container::LOGIN_WINDOWS));
100 mus::Window* window = 101 mus::Window* window =
101 views::WindowManagerConnection::Get()->NewWindow(properties); 102 views::WindowManagerConnection::Get()->NewWindow(properties);
102 params.native_widget = new views::NativeWidgetMus( 103 params.native_widget = new views::NativeWidgetMus(
103 widget, connector, window, mus::mojom::SurfaceType::DEFAULT); 104 widget, connector, window, mus::mojom::SurfaceType::DEFAULT);
104 widget->Init(params); 105 widget->Init(params);
105 widget->Show(); 106 widget->Show();
106 } 107 }
107 108
108 void Screenlock::ScreenlockStateChanged(bool screen_locked) { 109 void Screenlock::ScreenlockStateChanged(bool screen_locked) {
109 if (!screen_locked) 110 if (!screen_locked)
110 base::MessageLoop::current()->QuitWhenIdle(); 111 base::MessageLoop::current()->QuitWhenIdle();
111 } 112 }
112 113
113 } // namespace screenlock 114 } // namespace screenlock
114 } // namespace mash 115 } // namespace mash
OLDNEW
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/task_viewer/task_viewer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698