| Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h
|
| diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h
|
| similarity index 61%
|
| rename from chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.h
|
| rename to chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h
|
| index 109602abbcbd1e016a79f664cd53f725543cb627..886144134b8dfcf9aee89127c52be7ef72cb0325 100644
|
| --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.h
|
| +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h
|
| @@ -2,54 +2,50 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_TAB_H_
|
| -#define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_TAB_H_
|
| +#ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_PANEL_H_
|
| +#define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_PANEL_H_
|
|
|
| -#include "chrome/browser/extensions/extension_uninstall_dialog.h"
|
| -#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_tab.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/controls/combobox/combobox_listener.h"
|
|
|
| +class LaunchOptionsComboboxModel;
|
| class Profile;
|
|
|
| namespace extensions {
|
| class Extension;
|
| }
|
| -namespace gfx {
|
| -class Image;
|
| -}
|
| +
|
| namespace ui {
|
| class Event;
|
| }
|
| +
|
| namespace views {
|
| class Combobox;
|
| -class ImageView;
|
| class Label;
|
| class LabelButton;
|
| }
|
|
|
| -class LaunchOptionsComboboxModel;
|
| -
|
| -// The Summary tab of the app info dialog, which provides basic information and
|
| -// controls related to the app.
|
| -class AppInfoSummaryTab
|
| - : public AppInfoTab,
|
| - public views::ComboboxListener,
|
| - public views::ButtonListener,
|
| - public extensions::ExtensionUninstallDialog::Delegate {
|
| +// The summary panel of the app info dialog, which provides basic information
|
| +// and controls related to the app.
|
| +class AppInfoSummaryPanel : public AppInfoPanel,
|
| + public views::ComboboxListener,
|
| + public views::ButtonListener {
|
| public:
|
| - AppInfoSummaryTab(Profile* profile, const extensions::Extension* app);
|
| + AppInfoSummaryPanel(Profile* profile, const extensions::Extension* app);
|
|
|
| - virtual ~AppInfoSummaryTab();
|
| + virtual ~AppInfoSummaryPanel();
|
|
|
| private:
|
| // Internal initialisation methods.
|
| void CreateDescriptionControl();
|
| void CreateLaunchOptionControl();
|
| - void CreateButtons();
|
| + void CreateShortcutsButton();
|
|
|
| - void LayoutButtons();
|
| + void LayoutDescriptionControl();
|
| + void LayoutShortcutsButton();
|
|
|
| // Overridden from views::ComboboxListener:
|
| virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE;
|
| @@ -58,10 +54,6 @@ class AppInfoSummaryTab
|
| virtual void ButtonPressed(views::Button* sender,
|
| const ui::Event& event) OVERRIDE;
|
|
|
| - // Overridden from ExtensionUninstallDialog::Delegate.
|
| - virtual void ExtensionUninstallAccepted() OVERRIDE;
|
| - virtual void ExtensionUninstallCanceled() OVERRIDE;
|
| -
|
| // Returns the launch type of the app (e.g. pinned tab, fullscreen, etc).
|
| extensions::LaunchType GetLaunchType() const;
|
|
|
| @@ -70,29 +62,21 @@ class AppInfoSummaryTab
|
| void SetLaunchType(extensions::LaunchType) const;
|
| bool CanSetLaunchType() const;
|
|
|
| - // Uninstall the app. Must only be called if CanUninstallApp() returns true.
|
| - void UninstallApp();
|
| - bool CanUninstallApp() const;
|
| -
|
| // Create Shortcuts for the app. Must only be called if CanCreateShortcuts()
|
| // returns true.
|
| void CreateShortcuts();
|
| bool CanCreateShortcuts() const;
|
|
|
| - bool HasImportedModules();
|
| -
|
| // UI elements on the dialog.
|
| - views::View* app_summary_panel_;
|
| - views::Label* app_description_label_;
|
| - views::LabelButton* create_shortcuts_button_;
|
| + views::Label* description_heading_;
|
| + views::Label* description_label_;
|
|
|
| - scoped_ptr<extensions::ExtensionUninstallDialog> extension_uninstall_dialog_;
|
| - views::LabelButton* uninstall_button_;
|
| + views::LabelButton* create_shortcuts_button_;
|
|
|
| scoped_ptr<LaunchOptionsComboboxModel> launch_options_combobox_model_;
|
| views::Combobox* launch_options_combobox_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(AppInfoSummaryTab);
|
| + DISALLOW_COPY_AND_ASSIGN(AppInfoSummaryPanel);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_TAB_H_
|
| +#endif // CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_PANEL_H_
|
|
|