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

Side by Side Diff: headless/lib/headless_content_main_delegate.h

Issue 1854043002: convert //headless 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_ 5 #ifndef HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_
6 #define HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_ 6 #define HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "content/public/app/content_main_delegate.h" 12 #include "content/public/app/content_main_delegate.h"
12 #include "headless/lib/headless_content_client.h" 13 #include "headless/lib/headless_content_client.h"
13 14
14 namespace content { 15 namespace content {
15 class BrowserContext; 16 class BrowserContext;
16 } 17 }
17 18
18 namespace headless { 19 namespace headless {
19 20
20 class HeadlessBrowserImpl; 21 class HeadlessBrowserImpl;
21 class HeadlessContentBrowserClient; 22 class HeadlessContentBrowserClient;
22 class HeadlessContentUtilityClient; 23 class HeadlessContentUtilityClient;
23 class HeadlessContentRendererClient; 24 class HeadlessContentRendererClient;
24 25
25 class HeadlessContentMainDelegate : public content::ContentMainDelegate { 26 class HeadlessContentMainDelegate : public content::ContentMainDelegate {
26 public: 27 public:
27 explicit HeadlessContentMainDelegate(scoped_ptr<HeadlessBrowserImpl> browser); 28 explicit HeadlessContentMainDelegate(
29 std::unique_ptr<HeadlessBrowserImpl> browser);
28 ~HeadlessContentMainDelegate() override; 30 ~HeadlessContentMainDelegate() override;
29 31
30 // content::ContentMainDelegate implementation: 32 // content::ContentMainDelegate implementation:
31 bool BasicStartupComplete(int* exit_code) override; 33 bool BasicStartupComplete(int* exit_code) override;
32 void PreSandboxStartup() override; 34 void PreSandboxStartup() override;
33 int RunProcess( 35 int RunProcess(
34 const std::string& process_type, 36 const std::string& process_type,
35 const content::MainFunctionParams& main_function_params) override; 37 const content::MainFunctionParams& main_function_params) override;
36 void ZygoteForked() override; 38 void ZygoteForked() override;
37 content::ContentBrowserClient* CreateContentBrowserClient() override; 39 content::ContentBrowserClient* CreateContentBrowserClient() override;
38 content::ContentRendererClient* CreateContentRendererClient() override; 40 content::ContentRendererClient* CreateContentRendererClient() override;
39 content::ContentUtilityClient* CreateContentUtilityClient() override; 41 content::ContentUtilityClient* CreateContentUtilityClient() override;
40 42
41 HeadlessBrowserImpl* browser() const { return browser_.get(); } 43 HeadlessBrowserImpl* browser() const { return browser_.get(); }
42 44
43 private: 45 private:
44 friend class HeadlessBrowserTest; 46 friend class HeadlessBrowserTest;
45 47
46 static void InitializeResourceBundle(); 48 static void InitializeResourceBundle();
47 49
48 static HeadlessContentMainDelegate* GetInstance(); 50 static HeadlessContentMainDelegate* GetInstance();
49 51
50 scoped_ptr<HeadlessContentBrowserClient> browser_client_; 52 std::unique_ptr<HeadlessContentBrowserClient> browser_client_;
51 scoped_ptr<HeadlessContentRendererClient> renderer_client_; 53 std::unique_ptr<HeadlessContentRendererClient> renderer_client_;
52 scoped_ptr<HeadlessContentUtilityClient> utility_client_; 54 std::unique_ptr<HeadlessContentUtilityClient> utility_client_;
53 HeadlessContentClient content_client_; 55 HeadlessContentClient content_client_;
54 56
55 scoped_ptr<HeadlessBrowserImpl> browser_; 57 std::unique_ptr<HeadlessBrowserImpl> browser_;
56 58
57 DISALLOW_COPY_AND_ASSIGN(HeadlessContentMainDelegate); 59 DISALLOW_COPY_AND_ASSIGN(HeadlessContentMainDelegate);
58 }; 60 };
59 61
60 } // namespace headless 62 } // namespace headless
61 63
62 #endif // HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_ 64 #endif // HEADLESS_LIB_HEADLESS_CONTENT_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « headless/lib/headless_browser_browsertest.cc ('k') | headless/lib/headless_content_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698