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

Side by Side Diff: mojo/shell/application_instance.h

Issue 1734643003: Remove CapabilityFilter from Connect() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@13connector2
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 | « content/test/data/web_ui_mojo_shell_test.js ('k') | mojo/shell/application_instance.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 MOJO_SHELL_APPLICATION_INSTANCE_H_ 5 #ifndef MOJO_SHELL_APPLICATION_INSTANCE_H_
6 #define MOJO_SHELL_APPLICATION_INSTANCE_H_ 6 #define MOJO_SHELL_APPLICATION_INSTANCE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/process/process_handle.h" 15 #include "base/process/process_handle.h"
16 #include "mojo/public/cpp/bindings/binding.h" 16 #include "mojo/public/cpp/bindings/binding.h"
17 #include "mojo/public/cpp/bindings/weak_binding_set.h" 17 #include "mojo/public/cpp/bindings/weak_binding_set.h"
18 #include "mojo/shell/capability_filter.h"
19 #include "mojo/shell/connect_params.h" 18 #include "mojo/shell/connect_params.h"
20 #include "mojo/shell/identity.h" 19 #include "mojo/shell/identity.h"
21 #include "mojo/shell/public/interfaces/application_manager.mojom.h" 20 #include "mojo/shell/public/interfaces/application_manager.mojom.h"
22 #include "mojo/shell/public/interfaces/shell.mojom.h" 21 #include "mojo/shell/public/interfaces/shell.mojom.h"
23 #include "mojo/shell/public/interfaces/shell_client.mojom.h" 22 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
24 #include "url/gurl.h" 23 #include "url/gurl.h"
25 24
26 namespace mojo { 25 namespace mojo {
27 namespace shell { 26 namespace shell {
28 27
(...skipping 30 matching lines...) Expand all
59 private: 58 private:
60 // Shell implementation: 59 // Shell implementation:
61 void GetConnector(mojom::ConnectorRequest request) override; 60 void GetConnector(mojom::ConnectorRequest request) override;
62 void QuitApplication() override; 61 void QuitApplication() override;
63 62
64 // Connector implementation: 63 // Connector implementation:
65 void Connect(const String& app_url, 64 void Connect(const String& app_url,
66 uint32_t user_id, 65 uint32_t user_id,
67 shell::mojom::InterfaceProviderRequest remote_interfaces, 66 shell::mojom::InterfaceProviderRequest remote_interfaces,
68 shell::mojom::InterfaceProviderPtr local_interfaces, 67 shell::mojom::InterfaceProviderPtr local_interfaces,
69 mojom::CapabilityFilterPtr filter,
70 const ConnectCallback& callback) override; 68 const ConnectCallback& callback) override;
71 void Clone(mojom::ConnectorRequest request) override; 69 void Clone(mojom::ConnectorRequest request) override;
72 70
73 // PIDReceiver implementation: 71 // PIDReceiver implementation:
74 void SetPID(uint32_t pid) override; 72 void SetPID(uint32_t pid) override;
75 73
76 uint32_t GenerateUniqueID() const; 74 uint32_t GenerateUniqueID() const;
77 75
78 void CallAcceptConnection(scoped_ptr<ConnectParams> params); 76 void CallAcceptConnection(scoped_ptr<ConnectParams> params);
79 77
(...skipping 19 matching lines...) Expand all
99 NativeRunner* native_runner_; 97 NativeRunner* native_runner_;
100 base::ProcessId pid_; 98 base::ProcessId pid_;
101 99
102 DISALLOW_COPY_AND_ASSIGN(ApplicationInstance); 100 DISALLOW_COPY_AND_ASSIGN(ApplicationInstance);
103 }; 101 };
104 102
105 } // namespace shell 103 } // namespace shell
106 } // namespace mojo 104 } // namespace mojo
107 105
108 #endif // MOJO_SHELL_APPLICATION_INSTANCE_H_ 106 #endif // MOJO_SHELL_APPLICATION_INSTANCE_H_
OLDNEW
« no previous file with comments | « content/test/data/web_ui_mojo_shell_test.js ('k') | mojo/shell/application_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698