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

Side by Side Diff: mash/shell/shell_application_delegate.h

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.cc ('k') | mash/shell/shell_application_delegate.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 5 #ifndef MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
6 #define MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 6 #define MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 16 matching lines...) Expand all
27 : public mojo::ShellClient, 27 : public mojo::ShellClient,
28 public mash::shell::mojom::Shell, 28 public mash::shell::mojom::Shell,
29 public mojo::InterfaceFactory<mash::shell::mojom::Shell> { 29 public mojo::InterfaceFactory<mash::shell::mojom::Shell> {
30 public: 30 public:
31 ShellApplicationDelegate(); 31 ShellApplicationDelegate();
32 ~ShellApplicationDelegate() override; 32 ~ShellApplicationDelegate() override;
33 33
34 private: 34 private:
35 // mojo::ShellClient: 35 // mojo::ShellClient:
36 void Initialize(mojo::Connector* connector, const std::string& url, 36 void Initialize(mojo::Connector* connector, const std::string& url,
37 uint32_t id, uint32_t user_id) override; 37 const std::string& user_id, uint32_t id) override;
38 bool AcceptConnection(mojo::Connection* connection) override; 38 bool AcceptConnection(mojo::Connection* connection) override;
39 39
40 // mash::shell::mojom::Shell: 40 // mash::shell::mojom::Shell:
41 void AddScreenlockStateListener( 41 void AddScreenlockStateListener(
42 mojom::ScreenlockStateListenerPtr listener) override; 42 mojom::ScreenlockStateListenerPtr listener) override;
43 void LockScreen() override; 43 void LockScreen() override;
44 void UnlockScreen() override; 44 void UnlockScreen() override;
45 45
46 // mojo::InterfaceFactory<mash::shell::mojom::Shell>: 46 // mojo::InterfaceFactory<mash::shell::mojom::Shell>:
47 void Create(mojo::Connection* connection, 47 void Create(mojo::Connection* connection,
(...skipping 18 matching lines...) Expand all
66 mojo::BindingSet<mash::shell::mojom::Shell> bindings_; 66 mojo::BindingSet<mash::shell::mojom::Shell> bindings_;
67 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_; 67 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate); 69 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate);
70 }; 70 };
71 71
72 } // namespace shell 72 } // namespace shell
73 } // namespace mash 73 } // namespace mash
74 74
75 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 75 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
OLDNEW
« no previous file with comments | « mash/screenlock/screenlock.cc ('k') | mash/shell/shell_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698