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

Side by Side Diff: mash/session/session.h

Issue 2235493002: mash: Disable ash_sysui; begin removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Connect to chrome on mash session launch; add missing gn dep. Created 4 years, 4 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/session/BUILD.gn ('k') | mash/session/session.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_SESSION_SESSION_H_ 5 #ifndef MASH_SESSION_SESSION_H_
6 #define MASH_SESSION_SESSION_H_ 6 #define MASH_SESSION_SESSION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 void AddScreenlockStateListener( 42 void AddScreenlockStateListener(
43 mojom::ScreenlockStateListenerPtr listener) override; 43 mojom::ScreenlockStateListenerPtr listener) override;
44 void LockScreen() override; 44 void LockScreen() override;
45 void UnlockScreen() override; 45 void UnlockScreen() override;
46 46
47 // shell::InterfaceFactory<mojom::Session>: 47 // shell::InterfaceFactory<mojom::Session>:
48 void Create(const shell::Identity& remote_identity, 48 void Create(const shell::Identity& remote_identity,
49 mojom::SessionRequest request) override; 49 mojom::SessionRequest request) override;
50 50
51 void StartWindowManager(); 51 void StartWindowManager();
52 void StartSystemUI();
53 void StartAppDriver(); 52 void StartAppDriver();
54 void StartQuickLaunch(); 53 void StartQuickLaunch();
55 54
56 void StartScreenlock(); 55 void StartScreenlock();
57 void StopScreenlock(); 56 void StopScreenlock();
58 57
59 // Starts the application at |url|, running |restart_callback| if the 58 // Starts the application at |url|, running |restart_callback| if the
60 // connection to the application is closed. 59 // connection to the application is closed.
61 void StartRestartableService(const std::string& url, 60 void StartRestartableService(const std::string& url,
62 const base::Closure& restart_callback); 61 const base::Closure& restart_callback);
63 62
64 std::map<std::string, std::unique_ptr<shell::Connection>> connections_; 63 std::map<std::string, std::unique_ptr<shell::Connection>> connections_;
65 bool screen_locked_; 64 bool screen_locked_;
66 mojo::BindingSet<mojom::Session> bindings_; 65 mojo::BindingSet<mojom::Session> bindings_;
67 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_; 66 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
68 67
69 DISALLOW_COPY_AND_ASSIGN(Session); 68 DISALLOW_COPY_AND_ASSIGN(Session);
70 }; 69 };
71 70
72 } // namespace session 71 } // namespace session
73 } // namespace mash 72 } // namespace mash
74 73
75 #endif // MASH_SESSION_SESSION_H_ 74 #endif // MASH_SESSION_SESSION_H_
OLDNEW
« no previous file with comments | « mash/session/BUILD.gn ('k') | mash/session/session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698