| Index: chrome/browser/ui/views/hung_renderer_view.h
|
| diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h
|
| index 5d6366c2c01a9d92913421c0f9791edc779f33d7..37264b1c9c0fd7b439fc1d490dc646d359cdce2b 100644
|
| --- a/chrome/browser/ui/views/hung_renderer_view.h
|
| +++ b/chrome/browser/ui/views/hung_renderer_view.h
|
| @@ -36,7 +36,7 @@ class HungPagesTableModel : public ui::TableModel, public views::TableGrouper {
|
| };
|
|
|
| explicit HungPagesTableModel(Delegate* delegate);
|
| - virtual ~HungPagesTableModel();
|
| + ~HungPagesTableModel() override;
|
|
|
| void InitForWebContents(content::WebContents* hung_contents);
|
|
|
| @@ -48,14 +48,13 @@ class HungPagesTableModel : public ui::TableModel, public views::TableGrouper {
|
| content::RenderViewHost* GetRenderViewHost();
|
|
|
| // Overridden from ui::TableModel:
|
| - virtual int RowCount() override;
|
| - virtual base::string16 GetText(int row, int column_id) override;
|
| - virtual gfx::ImageSkia GetIcon(int row) override;
|
| - virtual void SetObserver(ui::TableModelObserver* observer) override;
|
| + int RowCount() override;
|
| + base::string16 GetText(int row, int column_id) override;
|
| + gfx::ImageSkia GetIcon(int row) override;
|
| + void SetObserver(ui::TableModelObserver* observer) override;
|
|
|
| // Overridden from views::TableGrouper:
|
| - virtual void GetGroupRange(int model_index,
|
| - views::GroupRange* range) override;
|
| + void GetGroupRange(int model_index, views::GroupRange* range) override;
|
|
|
| private:
|
| // Used to track a single WebContents. If the WebContents is destroyed
|
| @@ -70,8 +69,8 @@ class HungPagesTableModel : public ui::TableModel, public views::TableGrouper {
|
| }
|
|
|
| // WebContentsObserver overrides:
|
| - virtual void RenderProcessGone(base::TerminationStatus status) override;
|
| - virtual void WebContentsDestroyed() override;
|
| + void RenderProcessGone(base::TerminationStatus status) override;
|
| + void WebContentsDestroyed() override;
|
|
|
| private:
|
| HungPagesTableModel* model_;
|
| @@ -116,28 +115,26 @@ class HungRendererDialogView : public views::DialogDelegateView,
|
| virtual void EndForWebContents(content::WebContents* contents);
|
|
|
| // views::DialogDelegateView overrides:
|
| - virtual base::string16 GetWindowTitle() const override;
|
| - virtual void WindowClosing() override;
|
| - virtual int GetDialogButtons() const override;
|
| - virtual base::string16 GetDialogButtonLabel(
|
| - ui::DialogButton button) const override;
|
| - virtual views::View* CreateExtraView() override;
|
| - virtual bool Accept(bool window_closing) override;
|
| - virtual bool UseNewStyleForThisDialog() const override;
|
| + base::string16 GetWindowTitle() const override;
|
| + void WindowClosing() override;
|
| + int GetDialogButtons() const override;
|
| + base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
|
| + views::View* CreateExtraView() override;
|
| + bool Accept(bool window_closing) override;
|
| + bool UseNewStyleForThisDialog() const override;
|
|
|
| // views::ButtonListener overrides:
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| // HungPagesTableModel::Delegate overrides:
|
| - virtual void TabDestroyed() override;
|
| + void TabDestroyed() override;
|
|
|
| protected:
|
| HungRendererDialogView();
|
| - virtual ~HungRendererDialogView();
|
| + ~HungRendererDialogView() override;
|
|
|
| // views::View overrides:
|
| - virtual void ViewHierarchyChanged(
|
| + void ViewHierarchyChanged(
|
| const ViewHierarchyChangedDetails& details) override;
|
|
|
| static HungRendererDialogView* g_instance_;
|
|
|