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

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

Issue 1683853003: Revert of ash/mash: Add a mus-client that sets up ash to provide the system ui for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/shell/BUILD.gn ('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 30 matching lines...) Expand all
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,
48 mojo::InterfaceRequest<mash::shell::mojom::Shell> r) override; 48 mojo::InterfaceRequest<mash::shell::mojom::Shell> r) override;
49 49
50 void StartWindowManager(); 50 void StartWindowManager();
51 void StartSystemUI();
52 void StartWallpaper(); 51 void StartWallpaper();
53 void StartShelf(); 52 void StartShelf();
54 void StartBrowserDriver(); 53 void StartBrowserDriver();
55 void StartQuickLaunch(); 54 void StartQuickLaunch();
56 55
57 void StartScreenlock(); 56 void StartScreenlock();
58 void StopScreenlock(); 57 void StopScreenlock();
59 58
60 // Starts the application at |url|, running |restart_callback| if the 59 // Starts the application at |url|, running |restart_callback| if the
61 // connection to the application is closed. 60 // connection to the application is closed.
62 void StartRestartableService(const std::string& url, 61 void StartRestartableService(const std::string& url,
63 const base::Closure& restart_callback); 62 const base::Closure& restart_callback);
64 63
65 mojo::Shell* shell_; 64 mojo::Shell* shell_;
66 std::map<std::string, scoped_ptr<mojo::Connection>> connections_; 65 std::map<std::string, scoped_ptr<mojo::Connection>> connections_;
67 bool screen_locked_; 66 bool screen_locked_;
68 mojo::WeakBindingSet<mash::shell::mojom::Shell> bindings_; 67 mojo::WeakBindingSet<mash::shell::mojom::Shell> bindings_;
69 mojo::WeakInterfacePtrSet<mojom::ScreenlockStateListener> 68 mojo::WeakInterfacePtrSet<mojom::ScreenlockStateListener>
70 screenlock_listeners_; 69 screenlock_listeners_;
71 70
72 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate); 71 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate);
73 }; 72 };
74 73
75 } // namespace shell 74 } // namespace shell
76 } // namespace mash 75 } // namespace mash
77 76
78 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 77 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
OLDNEW
« no previous file with comments | « mash/shell/BUILD.gn ('k') | mash/shell/shell_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698