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

Side by Side Diff: chromecast/app/cast_main_delegate.h

Issue 1875623002: Convert //chromecast 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 CHROMECAST_APP_CAST_MAIN_DELEGATE_H_ 5 #ifndef CHROMECAST_APP_CAST_MAIN_DELEGATE_H_
6 #define CHROMECAST_APP_CAST_MAIN_DELEGATE_H_ 6 #define CHROMECAST_APP_CAST_MAIN_DELEGATE_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 "build/build_config.h" 11 #include "build/build_config.h"
11 #include "chromecast/common/cast_content_client.h" 12 #include "chromecast/common/cast_content_client.h"
12 #include "content/public/app/content_main_delegate.h" 13 #include "content/public/app/content_main_delegate.h"
13 14
14 namespace content { 15 namespace content {
15 class BrowserMainRunner; 16 class BrowserMainRunner;
16 } // namespace content 17 } // namespace content
17 18
18 namespace chromecast { 19 namespace chromecast {
19 20
(...skipping 19 matching lines...) Expand all
39 #if !defined(OS_ANDROID) 40 #if !defined(OS_ANDROID)
40 void ZygoteForked() override; 41 void ZygoteForked() override;
41 #endif // !defined(OS_ANDROID) 42 #endif // !defined(OS_ANDROID)
42 content::ContentBrowserClient* CreateContentBrowserClient() override; 43 content::ContentBrowserClient* CreateContentBrowserClient() override;
43 content::ContentRendererClient* CreateContentRendererClient() override; 44 content::ContentRendererClient* CreateContentRendererClient() override;
44 content::ContentUtilityClient* CreateContentUtilityClient() override; 45 content::ContentUtilityClient* CreateContentUtilityClient() override;
45 46
46 private: 47 private:
47 void InitializeResourceBundle(); 48 void InitializeResourceBundle();
48 49
49 scoped_ptr<CastContentBrowserClient> browser_client_; 50 std::unique_ptr<CastContentBrowserClient> browser_client_;
50 scoped_ptr<CastContentRendererClient> renderer_client_; 51 std::unique_ptr<CastContentRendererClient> renderer_client_;
51 scoped_ptr<CastContentUtilityClient> utility_client_; 52 std::unique_ptr<CastContentUtilityClient> utility_client_;
52 scoped_ptr<CastResourceDelegate> resource_delegate_; 53 std::unique_ptr<CastResourceDelegate> resource_delegate_;
53 CastContentClient content_client_; 54 CastContentClient content_client_;
54 55
55 #if defined(OS_ANDROID) 56 #if defined(OS_ANDROID)
56 scoped_ptr<content::BrowserMainRunner> browser_runner_; 57 std::unique_ptr<content::BrowserMainRunner> browser_runner_;
57 #endif // defined(OS_ANDROID) 58 #endif // defined(OS_ANDROID)
58 59
59 DISALLOW_COPY_AND_ASSIGN(CastMainDelegate); 60 DISALLOW_COPY_AND_ASSIGN(CastMainDelegate);
60 }; 61 };
61 62
62 } // namespace shell 63 } // namespace shell
63 } // namespace chromecast 64 } // namespace chromecast
64 65
65 #endif // CHROMECAST_APP_CAST_MAIN_DELEGATE_H_ 66 #endif // CHROMECAST_APP_CAST_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « chromecast/app/android/crash_handler.h ('k') | chromecast/app/linux/cast_crash_reporter_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698