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

Side by Side Diff: ash/shell/content/client/shell_main_delegate.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/shell/content/client/shell_browser_main_parts.h ('k') | ash/shell/shell_delegate_impl.h » ('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 ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_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 "content/public/app/content_main_delegate.h" 12 #include "content/public/app/content_main_delegate.h"
12 #include "content/shell/common/shell_content_client.h" 13 #include "content/shell/common/shell_content_client.h"
13 14
14 namespace content { 15 namespace content {
15 class ShellContentRendererClient; 16 class ShellContentRendererClient;
16 class ShellContentUtilityClient; 17 class ShellContentUtilityClient;
17 } 18 }
18 19
19 namespace ash { 20 namespace ash {
20 namespace shell { 21 namespace shell {
21 22
22 class ShellContentBrowserClient; 23 class ShellContentBrowserClient;
23 24
24 class ShellMainDelegate : public content::ContentMainDelegate { 25 class ShellMainDelegate : public content::ContentMainDelegate {
25 public: 26 public:
26 ShellMainDelegate(); 27 ShellMainDelegate();
27 ~ShellMainDelegate() override; 28 ~ShellMainDelegate() override;
28 29
29 bool BasicStartupComplete(int* exit_code) override; 30 bool BasicStartupComplete(int* exit_code) override;
30 void PreSandboxStartup() override; 31 void PreSandboxStartup() override;
31 content::ContentBrowserClient* CreateContentBrowserClient() override; 32 content::ContentBrowserClient* CreateContentBrowserClient() override;
32 33
33 private: 34 private:
34 void InitializeResourceBundle(); 35 void InitializeResourceBundle();
35 36
36 scoped_ptr<ShellContentBrowserClient> browser_client_; 37 std::unique_ptr<ShellContentBrowserClient> browser_client_;
37 content::ShellContentClient content_client_; 38 content::ShellContentClient content_client_;
38 39
39 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); 40 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
40 }; 41 };
41 42
42 } // namespace shell 43 } // namespace shell
43 } // namespace ash 44 } // namespace ash
44 45
45 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_ 46 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell/content/client/shell_browser_main_parts.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698