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_PROXY_H_ | 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ |
6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ | 6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "athena/activity/public/activity.h" | 10 #include "athena/activity/public/activity.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 bool IsVisible() override; | 36 bool IsVisible() override; |
37 ActivityMediaState GetMediaState() override; | 37 ActivityMediaState GetMediaState() override; |
38 aura::Window* GetWindow() override; | 38 aura::Window* GetWindow() override; |
39 content::WebContents* GetWebContents() override; | 39 content::WebContents* GetWebContents() override; |
40 | 40 |
41 // ActivityViewModel overrides: | 41 // ActivityViewModel overrides: |
42 void Init() override; | 42 void Init() override; |
43 SkColor GetRepresentativeColor() const override; | 43 SkColor GetRepresentativeColor() const override; |
44 base::string16 GetTitle() const override; | 44 base::string16 GetTitle() const override; |
45 gfx::ImageSkia GetIcon() const override; | 45 gfx::ImageSkia GetIcon() const override; |
| 46 void SetActivityView(ActivityView* activity_view) override; |
46 bool UsesFrame() const override; | 47 bool UsesFrame() const override; |
47 views::View* GetContentsView() override; | 48 views::View* GetContentsView() override; |
48 gfx::ImageSkia GetOverviewModeImage() override; | 49 gfx::ImageSkia GetOverviewModeImage() override; |
49 void PrepareContentsForOverview() override; | 50 void PrepareContentsForOverview() override; |
50 void ResetContentsView() override; | 51 void ResetContentsView() override; |
51 | 52 |
52 protected: | 53 protected: |
53 ~AppActivityProxy() override; | 54 ~AppActivityProxy() override; |
54 | 55 |
55 private: | 56 private: |
(...skipping 18 matching lines...) Expand all Loading... |
74 | 75 |
75 // True if restart got already called. | 76 // True if restart got already called. |
76 bool restart_called_; | 77 bool restart_called_; |
77 | 78 |
78 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); | 79 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); |
79 }; | 80 }; |
80 | 81 |
81 } // namespace athena | 82 } // namespace athena |
82 | 83 |
83 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ | 84 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ |
OLD | NEW |