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

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

Issue 1770533002: Change userid from a uint32_t to a string guid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@33connector
Patch Set: . Created 4 years, 9 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/shell/shell_application_delegate.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 "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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, const std::string& url,
79 uint32_t id, uint32_t user_id) { 79 const std::string& user_id, uint32_t id) {
80 tracing_.Initialize(connector, url); 80 tracing_.Initialize(connector, url);
81 81
82 mash::shell::mojom::ShellPtr mash_shell; 82 mash::shell::mojom::ShellPtr mash_shell;
83 connector->ConnectToInterface("mojo:mash_shell", &mash_shell); 83 connector->ConnectToInterface("mojo:mash_shell", &mash_shell);
84 mash_shell->AddScreenlockStateListener( 84 mash_shell->AddScreenlockStateListener(
85 bindings_.CreateInterfacePtrAndBind(this)); 85 bindings_.CreateInterfacePtrAndBind(this));
86 86
87 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); 87 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
88 views::WindowManagerConnection::Create(connector); 88 views::WindowManagerConnection::Create(connector);
89 89
(...skipping 14 matching lines...) Expand all
104 widget->Show(); 104 widget->Show();
105 } 105 }
106 106
107 void Screenlock::ScreenlockStateChanged(bool screen_locked) { 107 void Screenlock::ScreenlockStateChanged(bool screen_locked) {
108 if (!screen_locked) 108 if (!screen_locked)
109 base::MessageLoop::current()->QuitWhenIdle(); 109 base::MessageLoop::current()->QuitWhenIdle();
110 } 110 }
111 111
112 } // namespace screenlock 112 } // namespace screenlock
113 } // namespace main 113 } // namespace main
OLDNEW
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/shell/shell_application_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698