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

Side by Side Diff: chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc

Issue 1865213004: Convert //chrome/browser/ui 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 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" 5 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ptr_util.h"
8 #include "build/build_config.h" 9 #include "build/build_config.h"
9 #include "components/app_modal/javascript_dialog_manager.h" 10 #include "components/app_modal/javascript_dialog_manager.h"
10 #include "components/app_modal/javascript_native_dialog_factory.h" 11 #include "components/app_modal/javascript_native_dialog_factory.h"
11 #include "components/constrained_window/constrained_window_views.h" 12 #include "components/constrained_window/constrained_window_views.h"
12 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
13 #include "content/public/browser/web_contents_delegate.h" 14 #include "content/public/browser/web_contents_delegate.h"
14 15
15 #if defined(USE_X11) && !defined(OS_CHROMEOS) 16 #if defined(USE_X11) && !defined(OS_CHROMEOS)
16 #include "chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h" 17 #include "chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h"
17 #else 18 #else
(...skipping 12 matching lines...) Expand all
30 class ChromeJavaScriptAppModalDialogViews 31 class ChromeJavaScriptAppModalDialogViews
31 : public app_modal::JavaScriptAppModalDialogViews { 32 : public app_modal::JavaScriptAppModalDialogViews {
32 public: 33 public:
33 explicit ChromeJavaScriptAppModalDialogViews( 34 explicit ChromeJavaScriptAppModalDialogViews(
34 app_modal::JavaScriptAppModalDialog* parent) 35 app_modal::JavaScriptAppModalDialog* parent)
35 : app_modal::JavaScriptAppModalDialogViews(parent), 36 : app_modal::JavaScriptAppModalDialogViews(parent),
36 helper_(new AppModalDialogHelper(parent->web_contents())) {} 37 helper_(new AppModalDialogHelper(parent->web_contents())) {}
37 ~ChromeJavaScriptAppModalDialogViews() override {} 38 ~ChromeJavaScriptAppModalDialogViews() override {}
38 39
39 private: 40 private:
40 scoped_ptr<AppModalDialogHelper> helper_; 41 std::unique_ptr<AppModalDialogHelper> helper_;
41 42
42 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptAppModalDialogViews); 43 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptAppModalDialogViews);
43 }; 44 };
44 #endif 45 #endif
45 46
46 class ChromeJavaScriptNativeDialogViewsFactory 47 class ChromeJavaScriptNativeDialogViewsFactory
47 : public app_modal::JavaScriptNativeDialogFactory { 48 : public app_modal::JavaScriptNativeDialogFactory {
48 public: 49 public:
49 ChromeJavaScriptNativeDialogViewsFactory() {} 50 ChromeJavaScriptNativeDialogViewsFactory() {}
50 ~ChromeJavaScriptNativeDialogViewsFactory() override {} 51 ~ChromeJavaScriptNativeDialogViewsFactory() override {}
(...skipping 22 matching lines...) Expand all
73 constrained_window::CreateBrowserModalDialogViews(d, parent_window); 74 constrained_window::CreateBrowserModalDialogViews(d, parent_window);
74 return d; 75 return d;
75 } 76 }
76 77
77 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogViewsFactory); 78 DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogViewsFactory);
78 }; 79 };
79 80
80 } // namespace 81 } // namespace
81 82
82 void InstallChromeJavaScriptNativeDialogFactory() { 83 void InstallChromeJavaScriptNativeDialogFactory() {
83 app_modal::JavaScriptDialogManager::GetInstance()-> 84 app_modal::JavaScriptDialogManager::GetInstance()->SetNativeDialogFactory(
84 SetNativeDialogFactory( 85 base::WrapUnique(new ChromeJavaScriptNativeDialogViewsFactory));
85 make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
86 } 86 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/chrome_constrained_window_views_client.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698