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

Side by Side Diff: components/app_modal/views/javascript_app_modal_dialog_views.h

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 (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 COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_ 5 #ifndef COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
6 #define COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_ 6 #define COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_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 "components/app_modal/native_app_modal_dialog.h" 11 #include "components/app_modal/native_app_modal_dialog.h"
11 #include "ui/views/window/dialog_delegate.h" 12 #include "ui/views/window/dialog_delegate.h"
12 13
13 class JavaScriptAppModalDialog; 14 class JavaScriptAppModalDialog;
14 15
15 namespace views { 16 namespace views {
16 class MessageBoxView; 17 class MessageBoxView;
17 } 18 }
18 19
19 namespace app_modal { 20 namespace app_modal {
(...skipping 25 matching lines...) Expand all
45 // Overridden from views::WidgetDelegate: 46 // Overridden from views::WidgetDelegate:
46 ui::ModalType GetModalType() const override; 47 ui::ModalType GetModalType() const override;
47 views::View* GetContentsView() override; 48 views::View* GetContentsView() override;
48 views::View* GetInitiallyFocusedView() override; 49 views::View* GetInitiallyFocusedView() override;
49 void WindowClosing() override; 50 void WindowClosing() override;
50 views::Widget* GetWidget() override; 51 views::Widget* GetWidget() override;
51 const views::Widget* GetWidget() const override; 52 const views::Widget* GetWidget() const override;
52 53
53 private: 54 private:
54 // A pointer to the AppModalDialog that owns us. 55 // A pointer to the AppModalDialog that owns us.
55 scoped_ptr<JavaScriptAppModalDialog> parent_; 56 std::unique_ptr<JavaScriptAppModalDialog> parent_;
56 57
57 // The message box view whose commands we handle. 58 // The message box view whose commands we handle.
58 views::MessageBoxView* message_box_view_; 59 views::MessageBoxView* message_box_view_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogViews); 61 DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogViews);
61 }; 62 };
62 63
63 } // namespace app_modal 64 } // namespace app_modal
64 65
65 #endif // COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_ 66 #endif // COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
OLDNEW
« no previous file with comments | « components/app_modal/javascript_dialog_manager.cc ('k') | components/arc/arc_bridge_bootstrap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698