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

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

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 12 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
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/macros.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "base/process/process_handle.h" 10 #include "base/process/process_handle.h"
11 #include "build/build_config.h"
10 #include "content/common/application_setup.mojom.h" 12 #include "content/common/application_setup.mojom.h"
11 #include "content/common/mojo/channel_init.h" 13 #include "content/common/mojo/channel_init.h"
12 #include "content/common/mojo/service_registry_impl.h" 14 #include "content/common/mojo/service_registry_impl.h"
13 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" 15 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
14 16
15 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
16 #include "content/browser/mojo/service_registry_android.h" 18 #include "content/browser/mojo/service_registry_android.h"
17 #endif 19 #endif
18 20
19 namespace IPC { 21 namespace IPC {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #if defined(OS_ANDROID) 67 #if defined(OS_ANDROID)
66 scoped_ptr<ServiceRegistryAndroid> service_registry_android_; 68 scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
67 #endif 69 #endif
68 70
69 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost); 71 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
70 }; 72 };
71 73
72 } // namespace content 74 } // namespace content
73 75
74 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_ 76 #endif // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
OLDNEW
« no previous file with comments | « content/browser/mojo/mojo_app_connection_impl.cc ('k') | content/browser/mojo/mojo_application_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698