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

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

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (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 | « media/mojo/services/service_factory_impl.cc ('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>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 requesting_content_handler_id_ = id; 63 requesting_content_handler_id_ = id;
64 } 64 }
65 uint32_t requesting_content_handler_id() const { 65 uint32_t requesting_content_handler_id() const {
66 return requesting_content_handler_id_; 66 return requesting_content_handler_id_;
67 } 67 }
68 68
69 private: 69 private:
70 // Shell implementation: 70 // Shell implementation:
71 void ConnectToApplication( 71 void ConnectToApplication(
72 URLRequestPtr app_request, 72 URLRequestPtr app_request,
73 InterfaceRequest<InterfaceProvider> remote_interfaces, 73 shell::mojom::InterfaceProviderRequest remote_interfaces,
74 InterfaceProviderPtr local_interfaces, 74 shell::mojom::InterfaceProviderPtr local_interfaces,
75 mojom::CapabilityFilterPtr filter, 75 mojom::CapabilityFilterPtr filter,
76 const ConnectToApplicationCallback& callback) override; 76 const ConnectToApplicationCallback& callback) override;
77 void QuitApplication() override; 77 void QuitApplication() override;
78 78
79 // PIDReceiver implementation: 79 // PIDReceiver implementation:
80 void SetPID(uint32_t pid) override; 80 void SetPID(uint32_t pid) override;
81 81
82 uint32_t GenerateUniqueID() const; 82 uint32_t GenerateUniqueID() const;
83 83
84 void CallAcceptConnection(scoped_ptr<ConnectToApplicationParams> params); 84 void CallAcceptConnection(scoped_ptr<ConnectToApplicationParams> params);
(...skipping 21 matching lines...) Expand all
106 NativeRunner* native_runner_; 106 NativeRunner* native_runner_;
107 base::ProcessId pid_; 107 base::ProcessId pid_;
108 108
109 DISALLOW_COPY_AND_ASSIGN(ApplicationInstance); 109 DISALLOW_COPY_AND_ASSIGN(ApplicationInstance);
110 }; 110 };
111 111
112 } // namespace shell 112 } // namespace shell
113 } // namespace mojo 113 } // namespace mojo
114 114
115 #endif // MOJO_SHELL_APPLICATION_INSTANCE_H_ 115 #endif // MOJO_SHELL_APPLICATION_INSTANCE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/service_factory_impl.cc ('k') | mojo/shell/application_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698