| 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 "content/public/browser/web_contents_observer.h" | 10 #include "content/public/browser/web_contents_observer.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 virtual aura::Window* GetWindow() OVERRIDE; | 38 virtual aura::Window* GetWindow() OVERRIDE; |
| 39 | 39 |
| 40 // ActivityViewModel: | 40 // ActivityViewModel: |
| 41 virtual void Init() OVERRIDE; | 41 virtual void Init() OVERRIDE; |
| 42 virtual SkColor GetRepresentativeColor() const OVERRIDE; | 42 virtual SkColor GetRepresentativeColor() const OVERRIDE; |
| 43 virtual base::string16 GetTitle() const OVERRIDE; | 43 virtual base::string16 GetTitle() const OVERRIDE; |
| 44 virtual bool UsesFrame() const OVERRIDE; | 44 virtual bool UsesFrame() const OVERRIDE; |
| 45 virtual views::View* GetContentsView() OVERRIDE; | 45 virtual views::View* GetContentsView() OVERRIDE; |
| 46 virtual void CreateOverviewModeImage() OVERRIDE; | 46 virtual void CreateOverviewModeImage() OVERRIDE; |
| 47 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; | 47 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; |
| 48 virtual void PrepareContentsForOverview() OVERRIDE; |
| 49 virtual void ResetContentsView() OVERRIDE; |
| 48 | 50 |
| 49 protected: | 51 protected: |
| 50 virtual ~AppActivity(); | 52 virtual ~AppActivity(); |
| 51 | 53 |
| 52 // content::WebContentsObserver: | 54 // content::WebContentsObserver: |
| 53 virtual void TitleWasSet(content::NavigationEntry* entry, | 55 virtual void TitleWasSet(content::NavigationEntry* entry, |
| 54 bool explicit_set) OVERRIDE; | 56 bool explicit_set) OVERRIDE; |
| 55 virtual void DidUpdateFaviconURL( | 57 virtual void DidUpdateFaviconURL( |
| 56 const std::vector<content::FaviconURL>& candidates) OVERRIDE; | 58 const std::vector<content::FaviconURL>& candidates) OVERRIDE; |
| 57 | 59 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 87 // This object is owned by |AppRegistry| and will be a valid pointer as long | 89 // This object is owned by |AppRegistry| and will be a valid pointer as long |
| 88 // as this object lives. | 90 // as this object lives. |
| 89 AppActivityRegistry* app_activity_registry_; | 91 AppActivityRegistry* app_activity_registry_; |
| 90 | 92 |
| 91 DISALLOW_COPY_AND_ASSIGN(AppActivity); | 93 DISALLOW_COPY_AND_ASSIGN(AppActivity); |
| 92 }; | 94 }; |
| 93 | 95 |
| 94 } // namespace athena | 96 } // namespace athena |
| 95 | 97 |
| 96 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ | 98 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ |
| OLD | NEW |