Commit dc828793 authored by sashab@chromium.org's avatar sashab@chromium.org

Changed AppListDialogContentsView to extend DialogDelegate

Originally, AppListDialogContentsView extended WidgetDelegate directly,
and was not being detected as a dialog correctly on some platforms.
Updated AppListDialogContentsView to now be a DialogDelegate.

BUG=388637

Review URL: https://codereview.chromium.org/405873003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284648 0039d316-1c4b-4281-b951-d872f2087c98
parent 28a4ff7a
...@@ -154,10 +154,6 @@ ui::ModalType AppListDialogContentsView::GetModalType() const { ...@@ -154,10 +154,6 @@ ui::ModalType AppListDialogContentsView::GetModalType() const {
return ui::MODAL_TYPE_WINDOW; return ui::MODAL_TYPE_WINDOW;
} }
ui::AXRole AppListDialogContentsView::GetAccessibleWindowRole() const {
return ui::AX_ROLE_DIALOG;
}
void AppListDialogContentsView::WindowClosing() { void AppListDialogContentsView::WindowClosing() {
app_list_controller_delegate_->OnCloseChildDialog(); app_list_controller_delegate_->OnCloseChildDialog();
} }
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_VIEWS_APP_LIST_APP_LIST_DIALOG_CONTENTS_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_APP_LIST_APP_LIST_DIALOG_CONTENTS_VIEW_H_
#include "ui/views/controls/button/button.h" #include "ui/views/controls/button/button.h"
#include "ui/views/widget/widget_delegate.h" #include "ui/views/window/dialog_delegate.h"
class AppListControllerDelegate; class AppListControllerDelegate;
...@@ -17,7 +17,7 @@ class Widget; ...@@ -17,7 +17,7 @@ class Widget;
// The contents view for an App List Dialog, which covers the entire app list // The contents view for an App List Dialog, which covers the entire app list
// and adds a close button. // and adds a close button.
class AppListDialogContentsView : public views::WidgetDelegateView, class AppListDialogContentsView : public views::DialogDelegateView,
public views::ButtonListener { public views::ButtonListener {
public: public:
AppListDialogContentsView( AppListDialogContentsView(
...@@ -48,7 +48,6 @@ class AppListDialogContentsView : public views::WidgetDelegateView, ...@@ -48,7 +48,6 @@ class AppListDialogContentsView : public views::WidgetDelegateView,
protected: protected:
// Overridden from views::WidgetDelegate: // Overridden from views::WidgetDelegate:
virtual ui::ModalType GetModalType() const OVERRIDE; virtual ui::ModalType GetModalType() const OVERRIDE;
virtual ui::AXRole GetAccessibleWindowRole() const OVERRIDE;
virtual void WindowClosing() OVERRIDE; virtual void WindowClosing() OVERRIDE;
private: private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment