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

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

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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 EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 5 #ifndef EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
6 #define EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 6 #define EXTENSIONS_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 "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "content/public/app/content_main_delegate.h" 14 #include "content/public/app/content_main_delegate.h"
14 15
15 namespace content { 16 namespace content {
16 class BrowserContext; 17 class BrowserContext;
17 class ContentBrowserClient; 18 class ContentBrowserClient;
18 class ContentClient; 19 class ContentClient;
19 class ContentRendererClient; 20 class ContentRendererClient;
20 } 21 }
(...skipping 25 matching lines...) Expand all
46 virtual content::ContentUtilityClient* CreateShellContentUtilityClient(); 47 virtual content::ContentUtilityClient* CreateShellContentUtilityClient();
47 48
48 // Initializes the resource bundle and resources.pak. 49 // Initializes the resource bundle and resources.pak.
49 virtual void InitializeResourceBundle(); 50 virtual void InitializeResourceBundle();
50 51
51 private: 52 private:
52 // |process_type| is zygote, renderer, utility, etc. Returns true if the 53 // |process_type| is zygote, renderer, utility, etc. Returns true if the
53 // process needs data from resources.pak. 54 // process needs data from resources.pak.
54 static bool ProcessNeedsResourceBundle(const std::string& process_type); 55 static bool ProcessNeedsResourceBundle(const std::string& process_type);
55 56
56 scoped_ptr<content::ContentClient> content_client_; 57 std::unique_ptr<content::ContentClient> content_client_;
57 scoped_ptr<content::ContentBrowserClient> browser_client_; 58 std::unique_ptr<content::ContentBrowserClient> browser_client_;
58 scoped_ptr<content::ContentRendererClient> renderer_client_; 59 std::unique_ptr<content::ContentRendererClient> renderer_client_;
59 scoped_ptr<content::ContentUtilityClient> utility_client_; 60 std::unique_ptr<content::ContentUtilityClient> utility_client_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); 62 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
62 }; 63 };
63 64
64 } // namespace extensions 65 } // namespace extensions
65 66
66 #endif // EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_ 67 #endif // EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « extensions/common/value_counter.cc ('k') | extensions/shell/browser/api/identity/identity_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698