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

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

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/process/process_handle.h" 11 #include "base/process/process_handle.h"
11 #include "build/build_config.h" 12 #include "build/build_config.h"
12 #include "content/common/application_setup.mojom.h" 13 #include "content/common/application_setup.mojom.h"
13 #include "content/common/mojo/channel_init.h" 14 #include "content/common/mojo/channel_init.h"
14 #include "content/common/mojo/service_registry_impl.h" 15 #include "content/common/mojo/service_registry_impl.h"
15 #include "mojo/edk/embedder/scoped_platform_handle.h" 16 #include "mojo/edk/embedder/scoped_platform_handle.h"
16 #include "mojo/public/cpp/system/message_pipe.h" 17 #include "mojo/public/cpp/system/message_pipe.h"
17 18
18 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
19 #include "content/public/browser/android/service_registry_android.h" 20 #include "content/public/browser/android/service_registry_android.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 52
52 void OverrideIOTaskRunnerForTest( 53 void OverrideIOTaskRunnerForTest(
53 scoped_refptr<base::TaskRunner> io_task_runner); 54 scoped_refptr<base::TaskRunner> io_task_runner);
54 55
55 private: 56 private:
56 ChannelInit channel_init_; 57 ChannelInit channel_init_;
57 mojo::edk::ScopedPlatformHandle client_handle_; 58 mojo::edk::ScopedPlatformHandle client_handle_;
58 59
59 bool did_activate_; 60 bool did_activate_;
60 61
61 scoped_ptr<mojom::ApplicationSetup> application_setup_; 62 std::unique_ptr<mojom::ApplicationSetup> application_setup_;
62 ServiceRegistryImpl service_registry_; 63 ServiceRegistryImpl service_registry_;
63 64
64 scoped_refptr<base::TaskRunner> io_task_runner_override_; 65 scoped_refptr<base::TaskRunner> io_task_runner_override_;
65 66
66 #if defined(OS_ANDROID) 67 #if defined(OS_ANDROID)
67 scoped_ptr<ServiceRegistryAndroid> service_registry_android_; 68 std::unique_ptr<ServiceRegistryAndroid> service_registry_android_;
68 #endif 69 #endif
69 70
70 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost); 71 DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
71 }; 72 };
72 73
73 } // namespace content 74 } // namespace content
74 75
75 #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_child_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698