| Index: ash/status_area/status_area_view.h
|
| diff --git a/ash/status_area/status_area_view.h b/ash/status_area/status_area_view.h
|
| index 613b8f1fcdefc1225fcdb0889de7ecfa69d7f4aa..3738da107a00ee39c84b0bed6adedcd5785cb773 100644
|
| --- a/ash/status_area/status_area_view.h
|
| +++ b/ash/status_area/status_area_view.h
|
| @@ -26,7 +26,7 @@ class ASH_EXPORT StatusAreaView : public views::WidgetDelegate,
|
| void SetFocusCyclerForTesting(const FocusCycler* focus_cycler);
|
|
|
| // Overridden from views::View:
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| + virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
|
| virtual views::Widget* GetWidget() OVERRIDE;
|
| virtual const views::Widget* GetWidget() const OVERRIDE;
|
|
|
| @@ -35,9 +35,6 @@ class ASH_EXPORT StatusAreaView : public views::WidgetDelegate,
|
| virtual void DeleteDelegate() OVERRIDE;
|
|
|
| private:
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| -
|
| - SkBitmap status_mock_;
|
| const FocusCycler* focus_cycler_for_testing_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(StatusAreaView);
|
|
|