Chromium Code Reviews| Index: ash/common/shelf/shelf_widget.h |
| diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h |
| index 7225ccedaf08850275af592ab04d8e77003a7762..7f6b2c9f3eb4fcf3d799df0c475f142c51b4fb5d 100644 |
| --- a/ash/common/shelf/shelf_widget.h |
| +++ b/ash/common/shelf/shelf_widget.h |
| @@ -25,10 +25,15 @@ class AppListButton; |
| class FocusCycler; |
| class ShelfLayoutManager; |
| class ShelfView; |
| +class SmsObserver; |
| class StatusAreaWidget; |
| class WmShelf; |
| class WmWindow; |
| +namespace test { |
| +class SmsObserverTest; |
| +} |
| + |
| // The ShelfWidget manages the shelf view (which contains the shelf icons) and |
| // the status area widget. There is one ShelfWidget per display. It is created |
| // early during RootWindowController initialization. |
| @@ -106,6 +111,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget, |
| private: |
| class DelegateView; |
| friend class DelegateView; |
| + friend class ash::test::SmsObserverTest; |
| WmShelf* wm_shelf_; |
| @@ -122,6 +128,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget, |
| // at the login screen. |
| ShelfView* shelf_view_; |
| ShelfBackgroundAnimator background_animator_; |
| + SmsObserver* sms_observer_; |
|
tdanderson
2017/01/26 22:19:06
Who owns |sms_observer_|? (Should the owner be She
yiyix
2017/02/02 20:43:55
I think the owner is ShelfWidget as well.
tdanderson
2017/02/07 00:15:45
Great, thanks for clarifying.
|
| bool activating_as_fallback_; |
| DISALLOW_COPY_AND_ASSIGN(ShelfWidget); |