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

Side by Side Diff: mojo/shell/connect_to_application_params.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 | « mojo/shell/capability_filter_test.cc ('k') | mojo/shell/connect_util.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_CONNECT_TO_APPLICATION_PARAMS_H_ 5 #ifndef MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
6 #define MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_ 6 #define MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 const Identity& target() const { return target_; } 43 const Identity& target() const { return target_; }
44 44
45 const URLRequest* target_url_request() const { 45 const URLRequest* target_url_request() const {
46 return target_url_request_.get(); 46 return target_url_request_.get();
47 } 47 }
48 // NOTE: This doesn't reset |target_|. 48 // NOTE: This doesn't reset |target_|.
49 URLRequestPtr TakeTargetURLRequest() { 49 URLRequestPtr TakeTargetURLRequest() {
50 return std::move(target_url_request_); 50 return std::move(target_url_request_);
51 } 51 }
52 52
53 void set_remote_interfaces(InterfaceRequest<InterfaceProvider> value) { 53 void set_remote_interfaces(shell::mojom::InterfaceProviderRequest value) {
54 remote_interfaces_ = std::move(value); 54 remote_interfaces_ = std::move(value);
55 } 55 }
56 InterfaceRequest<InterfaceProvider> TakeRemoteInterfaces() { 56 shell::mojom::InterfaceProviderRequest TakeRemoteInterfaces() {
57 return std::move(remote_interfaces_); 57 return std::move(remote_interfaces_);
58 } 58 }
59 59
60 void set_local_interfaces(InterfaceProviderPtr value) { 60 void set_local_interfaces(shell::mojom::InterfaceProviderPtr value) {
61 local_interfaces_ = std::move(value); 61 local_interfaces_ = std::move(value);
62 } 62 }
63 InterfaceProviderPtr TakeLocalInterfaces() { 63 shell::mojom::InterfaceProviderPtr TakeLocalInterfaces() {
64 return std::move(local_interfaces_); 64 return std::move(local_interfaces_);
65 } 65 }
66 66
67 void set_on_application_end(const base::Closure& value) { 67 void set_on_application_end(const base::Closure& value) {
68 on_application_end_ = value; 68 on_application_end_ = value;
69 } 69 }
70 const base::Closure& on_application_end() const { 70 const base::Closure& on_application_end() const {
71 return on_application_end_; 71 return on_application_end_;
72 } 72 }
73 73
(...skipping 10 matching lines...) Expand all
84 // It may be null (i.e., is_null() returns true) which indicates that there is 84 // It may be null (i.e., is_null() returns true) which indicates that there is
85 // no source (e.g., for the first application or in tests). 85 // no source (e.g., for the first application or in tests).
86 Identity source_; 86 Identity source_;
87 // The identity of the application being connected to. 87 // The identity of the application being connected to.
88 Identity target_; 88 Identity target_;
89 // The URL request to fetch the application. It may contain more information 89 // The URL request to fetch the application. It may contain more information
90 // than |target_| (e.g., headers, request body). When it is taken, |target_| 90 // than |target_| (e.g., headers, request body). When it is taken, |target_|
91 // remains unchanged. 91 // remains unchanged.
92 URLRequestPtr target_url_request_; 92 URLRequestPtr target_url_request_;
93 93
94 InterfaceRequest<InterfaceProvider> remote_interfaces_; 94 shell::mojom::InterfaceProviderRequest remote_interfaces_;
95 InterfaceProviderPtr local_interfaces_; 95 shell::mojom::InterfaceProviderPtr local_interfaces_;
96 base::Closure on_application_end_; 96 base::Closure on_application_end_;
97 shell::mojom::Shell::ConnectToApplicationCallback connect_callback_; 97 shell::mojom::Shell::ConnectToApplicationCallback connect_callback_;
98 98
99 DISALLOW_COPY_AND_ASSIGN(ConnectToApplicationParams); 99 DISALLOW_COPY_AND_ASSIGN(ConnectToApplicationParams);
100 }; 100 };
101 101
102 } // namespace shell 102 } // namespace shell
103 } // namespace mojo 103 } // namespace mojo
104 104
105 #endif // MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_ 105 #endif // MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
OLDNEW
« no previous file with comments | « mojo/shell/capability_filter_test.cc ('k') | mojo/shell/connect_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698