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

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

Issue 1560223002: Add quick launcher for launching mojo apps from within mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@launcher
Patch Set: . Created 4 years, 11 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/quick_launch/quick_launch.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 15 matching lines...) Expand all
26 26
27 private: 27 private:
28 // mojo::ApplicationDelegate: 28 // mojo::ApplicationDelegate:
29 void Initialize(mojo::ApplicationImpl* app) override; 29 void Initialize(mojo::ApplicationImpl* app) override;
30 bool ConfigureIncomingConnection( 30 bool ConfigureIncomingConnection(
31 mojo::ApplicationConnection* connection) override; 31 mojo::ApplicationConnection* connection) override;
32 32
33 void StartWindowManager(); 33 void StartWindowManager();
34 void StartSystemUI(); 34 void StartSystemUI();
35 void StartBrowserDriver(); 35 void StartBrowserDriver();
36 void StartQuickLaunch();
36 37
37 // Starts the application at |url|, running |restart_callback| if the 38 // Starts the application at |url|, running |restart_callback| if the
38 // connection to the application is closed. 39 // connection to the application is closed.
39 void StartRestartableService(const std::string& url, 40 void StartRestartableService(const std::string& url,
40 const base::Closure& restart_callback); 41 const base::Closure& restart_callback);
41 42
42 mojo::ApplicationImpl* app_; 43 mojo::ApplicationImpl* app_;
43 std::map<std::string, scoped_ptr<mojo::ApplicationConnection>> connections_; 44 std::map<std::string, scoped_ptr<mojo::ApplicationConnection>> connections_;
44 45
45 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate); 46 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate);
46 }; 47 };
47 48
48 } // namespace shell 49 } // namespace shell
49 } // namespace mash 50 } // namespace mash
50 51
51 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 52 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_
OLDNEW
« no previous file with comments | « mash/quick_launch/quick_launch.cc ('k') | mash/shell/shell_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698