athena: Introduce ActivityView.

athena: Introduce ActivityView.

ActivityViewModel has the necessary information that should be displayed to the
user. So provide mechanism for it to be able to update the view when the relevant
information (e.g. title, icon, color) changes.

BUG=none
R=oshima@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/25e9f78ed30c770d8aa2723f312732a652341028

[sadrul, 2014-11-04 20:05:15]

sadrul@chromium.org changed reviewers:
+ oshima@chromium.org

[sadrul, 2014-11-04 20:05:16]

Using observers felt too heavy handed for this. So I went with a simpler
ActivityView that the ActivityViewModel knows about and updates, instead. WDYT?

https://codereview.chromium.org/694413005/diff/1/athena/activity/activity_fra...
File athena/activity/activity_frame_view.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/activity/activity_fra...
athena/activity/activity_frame_view.cc:71: // the activity-view by calling
SetActivityView(nullptr);
This seems unfortunate.

[oshima, 2014-11-04 22:17:04]

https://codereview.chromium.org/694413005/diff/1/athena/activity/activity_fra...
File athena/activity/activity_frame_view.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/activity/activity_fra...
athena/activity/activity_frame_view.cc:71: // the activity-view by calling
SetActivityView(nullptr);
On 2014/11/04 20:05:16, sadrul wrote:
> This seems unfortunate.

Yep, I was once tried to fix this and failed :(

I'll try again near future.

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity.cc
File athena/content/app_activity.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity....
athena/content/app_activity.cc:171: void
AppActivity::SetActivityView(ActivityView* view) {
DCHECK(!activitY_view_) ?

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity.h
File athena/content/app_activity.h (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity....
athena/content/app_activity.h:90: ActivityView* activity_view_;
can you document ownership?

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity_...
File athena/content/app_activity_unittest.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity_...
athena/content/app_activity_unittest.cc:164: aura::Window::Windows windows =
activity->GetWindow()->parent()->children();
This will fail if there is a non activity window. Can you update to use
WindowListProvider?

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity.cc
File athena/content/web_activity.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity....
athena/content/web_activity.cc:561: void
WebActivity::SetActivityView(ActivityView* view) {
ditto

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity.h
File athena/content/web_activity.h (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity....
athena/content/web_activity.h:109: ActivityView* activity_view_;
ditto

[sadrul, 2014-11-04 23:26:09]

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity.cc
File athena/content/app_activity.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity....
athena/content/app_activity.cc:171: void
AppActivity::SetActivityView(ActivityView* view) {
On 2014/11/04 22:17:04, oshima wrote:
> DCHECK(!activitY_view_) ?

Done.

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity.h
File athena/content/app_activity.h (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity....
athena/content/app_activity.h:90: ActivityView* activity_view_;
On 2014/11/04 22:17:04, oshima wrote:
> can you document ownership?

Done.

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity_...
File athena/content/app_activity_unittest.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/app_activity_...
athena/content/app_activity_unittest.cc:164: aura::Window::Windows windows =
activity->GetWindow()->parent()->children();
On 2014/11/04 22:17:04, oshima wrote:
> This will fail if there is a non activity window. Can you update to use
> WindowListProvider? 

Oops. I meant to move this in a separate patch, since it's unrelated. Removed
from this patchset. (I am working on cleaning up the unfortunate state of this
TestAppActivity: it is a subclass of AppActivity, but overrides pretty much all
of the implementation, and then duplicates some of it to get through the tests).

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity.cc
File athena/content/web_activity.cc (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity....
athena/content/web_activity.cc:561: void
WebActivity::SetActivityView(ActivityView* view) {
On 2014/11/04 22:17:04, oshima wrote:
> ditto

Done.

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity.h
File athena/content/web_activity.h (right):

https://codereview.chromium.org/694413005/diff/1/athena/content/web_activity....
athena/content/web_activity.h:109: ActivityView* activity_view_;
On 2014/11/04 22:17:04, oshima wrote:
> ditto

Done.

[oshima, 2014-11-04 23:42:41]

lgtm

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
File athena/activity/activity_frame_view.cc (right):

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
athena/activity/activity_frame_view.cc:71: // the activity-view by calling
SetActivityView(nullptr);
Can you add crbug.com/427113 ?

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
File athena/activity/activity_frame_view.h (right):

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
athena/activity/activity_frame_view.h:9: #include
"athena/activity/public/activity_view_model.h"
nit: do you need this?

[sadrul, 2014-11-05 03:36:43]

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
File athena/activity/activity_frame_view.cc (right):

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
athena/activity/activity_frame_view.cc:71: // the activity-view by calling
SetActivityView(nullptr);
On 2014/11/04 23:42:41, oshima wrote:
> Can you add crbug.com/427113 ?

Done.

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
File athena/activity/activity_frame_view.h (right):

https://codereview.chromium.org/694413005/diff/20001/athena/activity/activity...
athena/activity/activity_frame_view.h:9: #include
"athena/activity/public/activity_view_model.h"
On 2014/11/04 23:42:41, oshima wrote:
> nit: do you need this?

Nope. Removed.

[commit-bot: I haz the power, 2014-11-05 04:10:33]

Patchset 3 (id:??) landed as
https://crrev.com/25e9f78ed30c770d8aa2723f312732a652341028
Cr-Commit-Position: refs/heads/master@{#302753}

[sadrul, 2014-11-05 04:10:41]

Committed patchset #3 (id:40001) manually as
25e9f78ed30c770d8aa2723f312732a652341028 (presubmit successful).