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

Side by Side Diff: content/shell/app/shell_main_delegate.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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 | « content/renderer/raster_worker_pool.h ('k') | content/shell/app/shell_main_delegate.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 5 #ifndef CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
6 #define CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 6 #define CONTENT_SHELL_APP_SHELL_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 "build/build_config.h" 12 #include "build/build_config.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 ContentClient; 16 class ContentClient;
16 class ShellContentBrowserClient; 17 class ShellContentBrowserClient;
17 class ShellContentRendererClient; 18 class ShellContentRendererClient;
18 class ShellContentUtilityClient; 19 class ShellContentUtilityClient;
19 20
20 #if defined(OS_ANDROID) 21 #if defined(OS_ANDROID)
(...skipping 13 matching lines...) Expand all
34 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) 35 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
35 void ZygoteForked() override; 36 void ZygoteForked() override;
36 #endif 37 #endif
37 ContentBrowserClient* CreateContentBrowserClient() override; 38 ContentBrowserClient* CreateContentBrowserClient() override;
38 ContentRendererClient* CreateContentRendererClient() override; 39 ContentRendererClient* CreateContentRendererClient() override;
39 ContentUtilityClient* CreateContentUtilityClient() override; 40 ContentUtilityClient* CreateContentUtilityClient() override;
40 41
41 static void InitializeResourceBundle(); 42 static void InitializeResourceBundle();
42 43
43 private: 44 private:
44 scoped_ptr<ShellContentBrowserClient> browser_client_; 45 std::unique_ptr<ShellContentBrowserClient> browser_client_;
45 scoped_ptr<ShellContentRendererClient> renderer_client_; 46 std::unique_ptr<ShellContentRendererClient> renderer_client_;
46 scoped_ptr<ShellContentUtilityClient> utility_client_; 47 std::unique_ptr<ShellContentUtilityClient> utility_client_;
47 scoped_ptr<ContentClient> content_client_; 48 std::unique_ptr<ContentClient> content_client_;
48 49
49 #if defined(OS_ANDROID) 50 #if defined(OS_ANDROID)
50 scoped_ptr<BrowserMainRunner> browser_runner_; 51 std::unique_ptr<BrowserMainRunner> browser_runner_;
51 #endif 52 #endif
52 53
53 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); 54 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
54 }; 55 };
55 56
56 } // namespace content 57 } // namespace content
57 58
58 #endif // CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 59 #endif // CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « content/renderer/raster_worker_pool.h ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698