| Index: chrome/browser/ui/views/srt_prompt_dialog.h
|
| diff --git a/chrome/browser/ui/views/srt_prompt_dialog.h b/chrome/browser/ui/views/srt_prompt_dialog.h
|
| index 59e1110ee870261b16507ce9e668dcece14083a4..c2d7a76e43143040017a50ebabcdc0db5e94e0de 100644
|
| --- a/chrome/browser/ui/views/srt_prompt_dialog.h
|
| +++ b/chrome/browser/ui/views/srt_prompt_dialog.h
|
| @@ -8,31 +8,18 @@
|
| #include <memory>
|
|
|
| #include "base/macros.h"
|
| -#include "third_party/skia/include/core/SkColor.h"
|
| -#include "ui/gfx/animation/animation_delegate.h"
|
| -#include "ui/gfx/image/image_skia.h"
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/controls/button/label_button.h"
|
| #include "ui/views/window/dialog_delegate.h"
|
|
|
| class Browser;
|
|
|
| -namespace gfx {
|
| -class SlideAnimation;
|
| -}
|
| -
|
| namespace safe_browsing {
|
| class SRTPromptController;
|
| }
|
|
|
| -// A modal dialog asking the user if they want to run the Chrome Cleanup
|
| -// tool. The dialog will have the following sections:
|
| -//
|
| -// 1. Main section with general information about unwanted software that has
|
| -// been found on the user's system.
|
| -// 2. Expandable details section with more details about unwanted software that
|
| -// will be removed and Chrome settings that will be reset.
|
| -// 3. Checkbox asking for permissions to upload logs (not yet implemented).
|
| +// A modal dialog asking the user if they want to remove harmful software from
|
| +// their computers by running the Chrome Cleanup tool.
|
| //
|
| // The strings and icons used in the dialog are provided by a
|
| // |SRTPromptController| object, which will also receive information about how
|
| @@ -41,8 +28,7 @@ class SRTPromptController;
|
| // interaction with the dialog. See the |SRTPromptController| class's
|
| // description for more details.
|
| class SRTPromptDialog : public views::DialogDelegateView,
|
| - public views::ButtonListener,
|
| - public gfx::AnimationDelegate {
|
| + public views::ButtonListener {
|
| public:
|
| // The |controller| object manages its own lifetime and is not owned by
|
| // |SRTPromptDialog|. See the description of the |SRTPromptController| class
|
| @@ -61,8 +47,10 @@ class SRTPromptDialog : public views::DialogDelegateView,
|
|
|
| // views::DialogDelegate overrides.
|
| base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
|
| + views::View* CreateExtraView() override;
|
| bool Accept() override;
|
| bool Cancel() override;
|
| + bool Close() override;
|
|
|
| // views::View overrides.
|
| gfx::Size GetPreferredSize() const override;
|
| @@ -70,24 +58,13 @@ class SRTPromptDialog : public views::DialogDelegateView,
|
| // views::ButtonListener overrides.
|
| void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| - // gfx::AnimationDelegate overrides.
|
| - void AnimationProgressed(const gfx::Animation* animation) override;
|
| - void AnimationEnded(const gfx::Animation* animation) override;
|
| -
|
| private:
|
| - class ExpandableMessageView;
|
| -
|
| - SkColor GetDetailsButtonColor();
|
| - void UpdateDetailsButton();
|
| -
|
| Browser* browser_;
|
| // The pointer will be set to nullptr once the controller has been notified of
|
| // user interaction since the controller can delete itself after that point.
|
| safe_browsing::SRTPromptController* controller_;
|
|
|
| - std::unique_ptr<gfx::SlideAnimation> slide_animation_;
|
| - ExpandableMessageView* details_view_;
|
| - views::LabelButton* details_button_;
|
| + views::LabelButton* advanced_button_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SRTPromptDialog);
|
| };
|
|
|