Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: athena/test/sample_activity.h

Issue 548633005: Adding overview / layer framework to Activities so that unloaded / sleeping activities can be shown… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « athena/resource_manager/resource_manager_unittest.cc ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_TEST_SAMPLE_ACTIVITY_H_ 5 #ifndef ATHENA_TEST_SAMPLE_ACTIVITY_H_
6 #define ATHENA_TEST_SAMPLE_ACTIVITY_H_ 6 #define ATHENA_TEST_SAMPLE_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 "base/memory/scoped_ptr.h"
11 #include "ui/gfx/image/image_skia.h" 10 #include "ui/gfx/image/image_skia.h"
12 11
13 namespace athena { 12 namespace athena {
14 namespace test { 13 namespace test {
15 14
16 class SampleActivity : public Activity, 15 class SampleActivity : public Activity,
17 public ActivityViewModel { 16 public ActivityViewModel {
18 public: 17 public:
19 SampleActivity(SkColor color, 18 SampleActivity(SkColor color,
20 SkColor contents_color, 19 SkColor contents_color,
(...skipping 10 matching lines...) Expand all
31 virtual aura::Window* GetWindow() OVERRIDE; 30 virtual aura::Window* GetWindow() OVERRIDE;
32 31
33 // athena::ActivityViewModel: 32 // athena::ActivityViewModel:
34 virtual void Init() OVERRIDE; 33 virtual void Init() OVERRIDE;
35 virtual SkColor GetRepresentativeColor() const OVERRIDE; 34 virtual SkColor GetRepresentativeColor() const OVERRIDE;
36 virtual base::string16 GetTitle() const OVERRIDE; 35 virtual base::string16 GetTitle() const OVERRIDE;
37 virtual gfx::ImageSkia GetIcon() const OVERRIDE; 36 virtual gfx::ImageSkia GetIcon() const OVERRIDE;
38 virtual bool UsesFrame() const OVERRIDE; 37 virtual bool UsesFrame() const OVERRIDE;
39 virtual views::View* GetContentsView() OVERRIDE; 38 virtual views::View* GetContentsView() OVERRIDE;
40 virtual views::Widget* CreateWidget() OVERRIDE; 39 virtual views::Widget* CreateWidget() OVERRIDE;
41 virtual void CreateOverviewModeImage() OVERRIDE;
42 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 40 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
43 virtual void PrepareContentsForOverview() OVERRIDE; 41 virtual void PrepareContentsForOverview() OVERRIDE;
44 virtual void ResetContentsView() OVERRIDE; 42 virtual void ResetContentsView() OVERRIDE;
45 43
46 SkColor color_; 44 SkColor color_;
47 SkColor contents_color_; 45 SkColor contents_color_;
48 base::string16 title_; 46 base::string16 title_;
49 views::View* contents_view_; 47 views::View* contents_view_;
50 48
51 // The current state for this activity. 49 // The current state for this activity.
52 ActivityState current_state_; 50 ActivityState current_state_;
53 51
54 DISALLOW_COPY_AND_ASSIGN(SampleActivity); 52 DISALLOW_COPY_AND_ASSIGN(SampleActivity);
55 }; 53 };
56 54
57 } // namespace test 55 } // namespace test
58 } // namespace athena 56 } // namespace athena
59 57
60 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_ 58 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/resource_manager/resource_manager_unittest.cc ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698