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

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

Issue 346633002: Move channel_init out of mojo_common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gn build Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/child/mojo/mojo_application.h » ('j') | mojo/embedder/channel_init.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_APPLICATION_HOST_H_ 5 #ifndef CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
6 #define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_ 6 #define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
7 7
8 #include "base/process/process_handle.h" 8 #include "base/process/process_handle.h"
9 #include "mojo/common/channel_init.h" 9 #include "mojo/embedder/channel_init.h"
10 #include "mojo/embedder/scoped_platform_handle.h" 10 #include "mojo/embedder/scoped_platform_handle.h"
11 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h" 11 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
12 12
13 namespace IPC { 13 namespace IPC {
14 class Sender; 14 class Sender;
15 } 15 }
16 16
17 namespace content { 17 namespace content {
18 18
19 // MojoApplicationHost represents the code needed on the browser side to setup 19 // MojoApplicationHost represents the code needed on the browser side to setup
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 scoped_ptr<ServiceProviderImpl> child_service_provider_; 61 scoped_ptr<ServiceProviderImpl> child_service_provider_;
62 62
63 bool did_activate_; 63 bool did_activate_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost); 65 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
66 }; 66 };
67 67
68 } // namespace content 68 } // namespace content
69 69
70 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_ 70 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | content/child/mojo/mojo_application.h » ('j') | mojo/embedder/channel_init.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698