| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_H_ | 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_H_ |
| 6 #define ATHENA_CONTENT_APP_ACTIVITY_H_ | 6 #define ATHENA_CONTENT_APP_ACTIVITY_H_ |
| 7 | 7 |
| 8 #include "athena/activity/public/activity.h" | 8 #include "athena/activity/public/activity.h" |
| 9 #include "athena/activity/public/activity_view_model.h" | 9 #include "athena/activity/public/activity_view_model.h" |
| 10 #include "athena/content/app_activity_proxy.h" | 10 #include "athena/content/app_activity_proxy.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 ActivityMediaState GetMediaState() override; | 38 ActivityMediaState GetMediaState() override; |
| 39 aura::Window* GetWindow() override; | 39 aura::Window* GetWindow() override; |
| 40 content::WebContents* GetWebContents() override; | 40 content::WebContents* GetWebContents() override; |
| 41 | 41 |
| 42 // ActivityViewModel: | 42 // ActivityViewModel: |
| 43 void Init() override; | 43 void Init() override; |
| 44 SkColor GetRepresentativeColor() const override; | 44 SkColor GetRepresentativeColor() const override; |
| 45 base::string16 GetTitle() const override; | 45 base::string16 GetTitle() const override; |
| 46 gfx::ImageSkia GetIcon() const override; | 46 gfx::ImageSkia GetIcon() const override; |
| 47 bool UsesFrame() const override; | 47 bool UsesFrame() const override; |
| 48 views::Widget* CreateWidget() override; | |
| 49 views::View* GetContentsView() override; | 48 views::View* GetContentsView() override; |
| 50 gfx::ImageSkia GetOverviewModeImage() override; | 49 gfx::ImageSkia GetOverviewModeImage() override; |
| 51 void PrepareContentsForOverview() override; | 50 void PrepareContentsForOverview() override; |
| 52 void ResetContentsView() override; | 51 void ResetContentsView() override; |
| 53 | 52 |
| 54 protected: | 53 protected: |
| 55 // Constructor for test. | 54 // Constructor for test. |
| 56 explicit AppActivity(const std::string& app_id); | 55 explicit AppActivity(const std::string& app_id); |
| 57 | 56 |
| 58 ~AppActivity() override; | 57 ~AppActivity() override; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 86 | 85 |
| 87 // The content proxy. | 86 // The content proxy. |
| 88 scoped_ptr<ContentProxy> content_proxy_; | 87 scoped_ptr<ContentProxy> content_proxy_; |
| 89 | 88 |
| 90 DISALLOW_COPY_AND_ASSIGN(AppActivity); | 89 DISALLOW_COPY_AND_ASSIGN(AppActivity); |
| 91 }; | 90 }; |
| 92 | 91 |
| 93 } // namespace athena | 92 } // namespace athena |
| 94 | 93 |
| 95 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ | 94 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ |
| OLD | NEW |