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

Side by Side Diff: chrome/app/mash/mash_runner.h

Issue 1899083002: Convert //chrome 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
« no previous file with comments | « chrome/app/main_dll_loader_win.cc ('k') | chrome/app/mash/mash_runner.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 CHROME_APP_MASH_MASH_RUNNER_H_ 5 #ifndef CHROME_APP_MASH_MASH_RUNNER_H_
6 #define CHROME_APP_MASH_MASH_RUNNER_H_ 6 #define CHROME_APP_MASH_MASH_RUNNER_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 "services/shell/public/interfaces/shell_client.mojom.h" 11 #include "services/shell/public/interfaces/shell_client.mojom.h"
11 12
12 namespace shell { 13 namespace shell {
13 class ShellClient; 14 class ShellClient;
14 class ShellConnection; 15 class ShellConnection;
15 } 16 }
16 17
17 // Responsible for running mash, both child and main processes. 18 // Responsible for running mash, both child and main processes.
18 class MashRunner { 19 class MashRunner {
19 public: 20 public:
20 MashRunner(); 21 MashRunner();
21 ~MashRunner(); 22 ~MashRunner();
22 23
23 void Run(); 24 void Run();
24 25
25 private: 26 private:
26 void RunMain(); 27 void RunMain();
27 void RunChild(); 28 void RunChild();
28 29
29 void StartChildApp(shell::mojom::ShellClientRequest client_request); 30 void StartChildApp(shell::mojom::ShellClientRequest client_request);
30 31
31 scoped_ptr<shell::ShellClient> shell_client_; 32 std::unique_ptr<shell::ShellClient> shell_client_;
32 scoped_ptr<shell::ShellConnection> shell_connection_; 33 std::unique_ptr<shell::ShellConnection> shell_connection_;
33 34
34 DISALLOW_COPY_AND_ASSIGN(MashRunner); 35 DISALLOW_COPY_AND_ASSIGN(MashRunner);
35 }; 36 };
36 37
37 int MashMain(); 38 int MashMain();
38 39
39 #endif // CHROME_APP_MASH_MASH_RUNNER_H_ 40 #endif // CHROME_APP_MASH_MASH_RUNNER_H_
OLDNEW
« no previous file with comments | « chrome/app/main_dll_loader_win.cc ('k') | chrome/app/mash/mash_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698