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

Side by Side Diff: content/child/child_thread_impl.h

Issue 2226403002: Remove Channel token from InProcessChildThreadParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moar-channels
Patch Set: rebase Created 4 years, 4 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/browser/utility_process_host_impl.cc ('k') | content/child/child_thread_impl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHILD_CHILD_THREAD_IMPL_H_ 5 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 6 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 bool RouteMessage(const IPC::Message& msg) override; 226 bool RouteMessage(const IPC::Message& msg) override;
227 227
228 private: 228 private:
229 IPC::Sender* const sender_; 229 IPC::Sender* const sender_;
230 }; 230 };
231 231
232 void Init(const Options& options); 232 void Init(const Options& options);
233 233
234 // We create the channel first without connecting it so we can add filters 234 // We create the channel first without connecting it so we can add filters
235 // prior to any messages being received, then connect it afterwards. 235 // prior to any messages being received, then connect it afterwards.
236 void ConnectChannel(bool use_mojo_channel, const std::string& ipc_token); 236 void ConnectChannel(bool use_mojo_channel);
237 237
238 // IPC message handlers. 238 // IPC message handlers.
239 void OnShutdown(); 239 void OnShutdown();
240 void OnSetProfilerStatus(tracked_objects::ThreadData::Status status); 240 void OnSetProfilerStatus(tracked_objects::ThreadData::Status status);
241 void OnGetChildProfilerData(int sequence_number, int current_profiling_phase); 241 void OnGetChildProfilerData(int sequence_number, int current_profiling_phase);
242 void OnProfilingPhaseCompleted(int profiling_phase); 242 void OnProfilingPhaseCompleted(int profiling_phase);
243 #ifdef IPC_MESSAGE_LOG_ENABLED 243 #ifdef IPC_MESSAGE_LOG_ENABLED
244 void OnSetIPCLoggingEnabled(bool enable); 244 void OnSetIPCLoggingEnabled(bool enable);
245 #endif 245 #endif
246 246
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 ~Options(); 313 ~Options();
314 314
315 class Builder; 315 class Builder;
316 316
317 std::string channel_name; 317 std::string channel_name;
318 bool use_mojo_channel; 318 bool use_mojo_channel;
319 bool auto_start_mojo_shell_connection; 319 bool auto_start_mojo_shell_connection;
320 bool connect_to_browser; 320 bool connect_to_browser;
321 scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner; 321 scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner;
322 std::vector<IPC::MessageFilter*> startup_filters; 322 std::vector<IPC::MessageFilter*> startup_filters;
323 std::string in_process_ipc_token;
324 std::string in_process_application_token; 323 std::string in_process_application_token;
325 324
326 private: 325 private:
327 Options(); 326 Options();
328 }; 327 };
329 328
330 class ChildThreadImpl::Options::Builder { 329 class ChildThreadImpl::Options::Builder {
331 public: 330 public:
332 Builder(); 331 Builder();
333 332
334 Builder& InBrowserProcess(const InProcessChildThreadParams& params); 333 Builder& InBrowserProcess(const InProcessChildThreadParams& params);
335 Builder& UseMojoChannel(bool use_mojo_channel); 334 Builder& UseMojoChannel(bool use_mojo_channel);
336 Builder& AutoStartMojoShellConnection(bool auto_start); 335 Builder& AutoStartMojoShellConnection(bool auto_start);
337 Builder& ConnectToBrowser(bool connect_to_browser); 336 Builder& ConnectToBrowser(bool connect_to_browser);
338 Builder& WithChannelName(const std::string& channel_name); 337 Builder& WithChannelName(const std::string& channel_name);
339 Builder& AddStartupFilter(IPC::MessageFilter* filter); 338 Builder& AddStartupFilter(IPC::MessageFilter* filter);
340 339
341 Options Build(); 340 Options Build();
342 341
343 private: 342 private:
344 struct Options options_; 343 struct Options options_;
345 344
346 DISALLOW_COPY_AND_ASSIGN(Builder); 345 DISALLOW_COPY_AND_ASSIGN(Builder);
347 }; 346 };
348 347
349 } // namespace content 348 } // namespace content
350 349
351 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_ 350 #endif // CONTENT_CHILD_CHILD_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/utility_process_host_impl.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698