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

Side by Side Diff: ui/views_content_client/views_content_main_delegate.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_MAIN_DELEGATE_H_ 5 #ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_ 6 #define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_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 "content/public/app/content_main_delegate.h" 11 #include "content/public/app/content_main_delegate.h"
11 #include "content/shell/common/shell_content_client.h" 12 #include "content/shell/common/shell_content_client.h"
12 13
13 namespace ui { 14 namespace ui {
14 15
15 class ViewsContentBrowserClient; 16 class ViewsContentBrowserClient;
16 class ViewsContentClient; 17 class ViewsContentClient;
17 18
18 class ViewsContentMainDelegate : public content::ContentMainDelegate { 19 class ViewsContentMainDelegate : public content::ContentMainDelegate {
19 public: 20 public:
20 explicit ViewsContentMainDelegate(ViewsContentClient* views_content_client); 21 explicit ViewsContentMainDelegate(ViewsContentClient* views_content_client);
21 ~ViewsContentMainDelegate() override; 22 ~ViewsContentMainDelegate() override;
22 23
23 // content::ContentMainDelegate implementation 24 // content::ContentMainDelegate implementation
24 bool BasicStartupComplete(int* exit_code) override; 25 bool BasicStartupComplete(int* exit_code) override;
25 void PreSandboxStartup() override; 26 void PreSandboxStartup() override;
26 content::ContentBrowserClient* CreateContentBrowserClient() override; 27 content::ContentBrowserClient* CreateContentBrowserClient() override;
27 28
28 private: 29 private:
29 scoped_ptr<ViewsContentBrowserClient> browser_client_; 30 std::unique_ptr<ViewsContentBrowserClient> browser_client_;
30 content::ShellContentClient content_client_; 31 content::ShellContentClient content_client_;
31 ViewsContentClient* views_content_client_; 32 ViewsContentClient* views_content_client_;
32 33
33 DISALLOW_COPY_AND_ASSIGN(ViewsContentMainDelegate); 34 DISALLOW_COPY_AND_ASSIGN(ViewsContentMainDelegate);
34 }; 35 };
35 36
36 } // namespace ui 37 } // namespace ui
37 38
38 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_ 39 #endif // UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/views_content_client/views_content_client_main_parts_chromeos.cc ('k') | ui/web_dialogs/web_dialog_web_contents_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698