| Index: chrome/browser/chromeos/status/status_area_view.h
|
| diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h
|
| index 72d54abcd8d318821b25460889b075bbe4db1794..196800a47930a33f07480e8ed4f423d8d7f726a5 100644
|
| --- a/chrome/browser/chromeos/status/status_area_view.h
|
| +++ b/chrome/browser/chromeos/status/status_area_view.h
|
| @@ -14,19 +14,21 @@
|
| #include "ui/views/accessible_pane_view.h"
|
| #include "ui/views/view.h"
|
| #include "ui/views/widget/widget.h"
|
| +#include "ui/views/widget/widget_delegate.h"
|
|
|
| // This class is used to wrap the small informative widgets in the upper-right
|
| // of the window title bar. It is used on ChromeOS only.
|
| class StatusAreaView : public views::AccessiblePaneView,
|
| public views::Widget::Observer,
|
| - public base::SupportsWeakPtr<StatusAreaView> {
|
| + public base::SupportsWeakPtr<StatusAreaView>,
|
| + public views::WidgetDelegate {
|
| public:
|
| enum ButtonBorder {
|
| NO_BORDER,
|
| HAS_BORDER
|
| };
|
|
|
| - explicit StatusAreaView();
|
| + StatusAreaView();
|
| virtual ~StatusAreaView();
|
|
|
| void AddButton(StatusAreaButton* button, ButtonBorder border);
|
| @@ -51,6 +53,11 @@ class StatusAreaView : public views::AccessiblePaneView,
|
| virtual void PreferredSizeChanged() OVERRIDE;
|
| virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
|
|
|
| + // views::WidgetDelegate overrides:
|
| + virtual bool CanActivate() const OVERRIDE;
|
| + virtual views::Widget* GetWidget() OVERRIDE;
|
| + virtual const views::Widget* GetWidget() const OVERRIDE;
|
| +
|
| private:
|
| // Overridden from views::FocusChangeListener:
|
| virtual void OnDidChangeFocus(views::View* focused_before,
|
|
|