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

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

Issue 1729723003: Reland: Remove DialogDelegate::OnClosed() which is redundant with (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with fix Created 4 years, 10 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 "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "components/app_modal/native_app_modal_dialog.h" 10 #include "components/app_modal/native_app_modal_dialog.h"
(...skipping 28 matching lines...) Expand all
39 base::string16 GetWindowTitle() const override; 39 base::string16 GetWindowTitle() const override;
40 void DeleteDelegate() override; 40 void DeleteDelegate() override;
41 bool Cancel() override; 41 bool Cancel() override;
42 bool Accept() override; 42 bool Accept() override;
43 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; 43 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
44 44
45 // Overridden from views::WidgetDelegate: 45 // Overridden from views::WidgetDelegate:
46 ui::ModalType GetModalType() const override; 46 ui::ModalType GetModalType() const override;
47 views::View* GetContentsView() override; 47 views::View* GetContentsView() override;
48 views::View* GetInitiallyFocusedView() override; 48 views::View* GetInitiallyFocusedView() override;
49 void OnClosed() override; 49 void WindowClosing() override;
50 views::Widget* GetWidget() override; 50 views::Widget* GetWidget() override;
51 const views::Widget* GetWidget() const override; 51 const views::Widget* GetWidget() const override;
52 52
53 private: 53 private:
54 // A pointer to the AppModalDialog that owns us. 54 // A pointer to the AppModalDialog that owns us.
55 scoped_ptr<JavaScriptAppModalDialog> parent_; 55 scoped_ptr<JavaScriptAppModalDialog> parent_;
56 56
57 // The message box view whose commands we handle. 57 // The message box view whose commands we handle.
58 views::MessageBoxView* message_box_view_; 58 views::MessageBoxView* message_box_view_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogViews); 60 DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogViews);
61 }; 61 };
62 62
63 } // namespace app_modal 63 } // namespace app_modal
64 64
65 #endif // COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_ 65 #endif // COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698