| Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
|
| diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
|
| index cb2498f064fd0b0bb7c51e04ae8b3d8bc4df0205..ae087fd27c786898447ad4d566538275ec5614ac 100644
|
| --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
|
| +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
|
| @@ -4,26 +4,24 @@
|
|
|
| #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h"
|
|
|
| -#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_manage_tab.h"
|
| #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_tab.h"
|
| #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.h"
|
| -#include "chrome/browser/ui/views/constrained_window_views.h"
|
| #include "grit/generated_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| +#include "ui/gfx/geometry/rect.h"
|
| #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
|
| #include "ui/views/layout/fill_layout.h"
|
| -#include "ui/views/layout/layout_manager.h"
|
| #include "ui/views/widget/widget.h"
|
| -#include "ui/views/window/dialog_delegate.h"
|
|
|
| void ShowAppInfoDialog(gfx::NativeWindow parent_window,
|
| const gfx::Rect& dialog_widget_bounds,
|
| Profile* profile,
|
| const extensions::Extension* app,
|
| const base::Closure& close_callback) {
|
| - views::Widget* dialog = CreateBrowserModalDialogViews(
|
| + views::Widget* dialog = AppListDialogContentsView::CreateDialogWidget(
|
| new AppInfoDialog(parent_window, profile, app, close_callback),
|
| - parent_window);
|
| + parent_window,
|
| + dialog_widget_bounds);
|
| dialog->SetBounds(dialog_widget_bounds);
|
| dialog->Show();
|
| }
|
| @@ -53,10 +51,9 @@ AppInfoDialog::AppInfoDialog(gfx::NativeWindow parent_window,
|
|
|
| AppInfoDialog::~AppInfoDialog() {}
|
|
|
| -bool AppInfoDialog::Cancel() {
|
| +void AppInfoDialog::OnClosed() {
|
| if (!close_callback_.is_null())
|
| close_callback_.Run();
|
| - return true;
|
| }
|
|
|
| gfx::Size AppInfoDialog::GetPreferredSize() const {
|
| @@ -68,8 +65,3 @@ gfx::Size AppInfoDialog::GetPreferredSize() const {
|
| return gfx::Size(kDialogWidth, kDialogHeight);
|
| }
|
|
|
| -int AppInfoDialog::GetDialogButtons() const { return ui::DIALOG_BUTTON_NONE; }
|
| -
|
| -ui::ModalType AppInfoDialog::GetModalType() const {
|
| - return ui::MODAL_TYPE_WINDOW;
|
| -}
|
|
|