Chromium Code Reviews| Index: athena/activity/activity_frame_view.h |
| diff --git a/athena/activity/activity_frame_view.h b/athena/activity/activity_frame_view.h |
| index f4a59fbf13deabe0ea80299318d52e9628b20e46..f3c50b721d133a6c32f889be1056817109efe19f 100644 |
| --- a/athena/activity/activity_frame_view.h |
| +++ b/athena/activity/activity_frame_view.h |
| @@ -5,6 +5,8 @@ |
| #ifndef ATHENA_ACTIVITY_ACTIVITY_FRAME_VIEW_H_ |
| #define ATHENA_ACTIVITY_ACTIVITY_FRAME_VIEW_H_ |
| +#include "athena/activity/public/activity_view.h" |
| +#include "athena/activity/public/activity_view_model.h" |
|
oshima
2014/11/04 23:42:41
nit: do you need this?
sadrul
2014/11/05 03:36:43
Nope. Removed.
|
| #include "athena/wm/public/window_manager_observer.h" |
| #include "ui/gfx/insets.h" |
| #include "ui/views/window/non_client_view.h" |
| @@ -21,7 +23,8 @@ class ActivityViewModel; |
| // A NonClientFrameView used for activity. |
| class ActivityFrameView : public views::NonClientFrameView, |
| - public WindowManagerObserver { |
| + public WindowManagerObserver, |
| + public ActivityView { |
| public: |
| // The frame class name. |
| static const char kViewClassName[]; |
| @@ -47,6 +50,11 @@ class ActivityFrameView : public views::NonClientFrameView, |
| void OnPaintBackground(gfx::Canvas* canvas) override; |
| private: |
| + // ActivityView: |
| + void UpdateTitle() override; |
| + void UpdateIcon() override; |
| + void UpdateRepresentativeColor() override; |
| + |
| // WindowManagerObserver: |
| void OnOverviewModeEnter() override; |
| void OnOverviewModeExit() override; |