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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ 5 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_
6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_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 "content/public/browser/browser_main_parts.h" 11 #include "content/public/browser/browser_main_parts.h"
11 12
12 namespace content { 13 namespace content {
13 class ShellBrowserContext; 14 class ShellBrowserContext;
14 struct MainFunctionParams; 15 struct MainFunctionParams;
15 } 16 }
16 17
17 namespace views { 18 namespace views {
18 class ViewsDelegate; 19 class ViewsDelegate;
19 } 20 }
(...skipping 23 matching lines...) Expand all
43 ViewsContentClient* views_content_client() { 44 ViewsContentClient* views_content_client() {
44 return views_content_client_; 45 return views_content_client_;
45 } 46 }
46 47
47 protected: 48 protected:
48 ViewsContentClientMainParts( 49 ViewsContentClientMainParts(
49 const content::MainFunctionParams& content_params, 50 const content::MainFunctionParams& content_params,
50 ViewsContentClient* views_content_client); 51 ViewsContentClient* views_content_client);
51 52
52 private: 53 private:
53 scoped_ptr<content::ShellBrowserContext> browser_context_; 54 std::unique_ptr<content::ShellBrowserContext> browser_context_;
54 55
55 scoped_ptr<views::ViewsDelegate> views_delegate_; 56 std::unique_ptr<views::ViewsDelegate> views_delegate_;
56 57
57 ViewsContentClient* views_content_client_; 58 ViewsContentClient* views_content_client_;
58 59
59 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainParts); 60 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainParts);
60 }; 61 };
61 62
62 } // namespace ui 63 } // namespace ui
63 64
64 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_ 65 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_
OLDNEW
« no previous file with comments | « ui/views/window/non_client_view.cc ('k') | ui/views_content_client/views_content_client_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698