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

Side by Side Diff: content/browser/mojo/mojo_shell_context.h

Issue 1828733004: Load application manifests from resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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 CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ 5 #ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
6 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ 6 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 const std::string& user_id, 46 const std::string& user_id,
47 const std::string& name, 47 const std::string& name,
48 const std::string& requestor_name, 48 const std::string& requestor_name,
49 mojo::shell::mojom::InterfaceProviderRequest request, 49 mojo::shell::mojom::InterfaceProviderRequest request,
50 mojo::shell::mojom::InterfaceProviderPtr exposed_services, 50 mojo::shell::mojom::InterfaceProviderPtr exposed_services,
51 const mojo::shell::mojom::Connector::ConnectCallback& callback); 51 const mojo::shell::mojom::Connector::ConnectCallback& callback);
52 52
53 static void SetApplicationsForTest(const StaticApplicationMap* apps); 53 static void SetApplicationsForTest(const StaticApplicationMap* apps);
54 54
55 private: 55 private:
56 class BuiltinManifestProvider;
56 class Proxy; 57 class Proxy;
57 friend class Proxy; 58 friend class Proxy;
58 59
59 void ConnectToApplicationOnOwnThread( 60 void ConnectToApplicationOnOwnThread(
60 const std::string& user_id, 61 const std::string& user_id,
61 const std::string& name, 62 const std::string& name,
62 const std::string& requestor_name, 63 const std::string& requestor_name,
63 mojo::shell::mojom::InterfaceProviderRequest request, 64 mojo::shell::mojom::InterfaceProviderRequest request,
64 mojo::shell::mojom::InterfaceProviderPtr exposed_services, 65 mojo::shell::mojom::InterfaceProviderPtr exposed_services,
65 const mojo::shell::mojom::Connector::ConnectCallback& callback); 66 const mojo::shell::mojom::Connector::ConnectCallback& callback);
66 67
67 static base::LazyInstance<scoped_ptr<Proxy>> proxy_; 68 static base::LazyInstance<scoped_ptr<Proxy>> proxy_;
68 69
70 scoped_ptr<BuiltinManifestProvider> manifest_provider_;
69 scoped_ptr<catalog::Factory> catalog_; 71 scoped_ptr<catalog::Factory> catalog_;
70 scoped_ptr<mojo::shell::Shell> shell_; 72 scoped_ptr<mojo::shell::Shell> shell_;
71 73
72 DISALLOW_COPY_AND_ASSIGN(MojoShellContext); 74 DISALLOW_COPY_AND_ASSIGN(MojoShellContext);
73 }; 75 };
74 76
75 } // namespace content 77 } // namespace content
76 78
77 #endif // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ 79 #endif // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
OLDNEW
« no previous file with comments | « content/browser/mojo/mojo_child_connection.cc ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698