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

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

Issue 550643002: [Athena] Hack to display favicons for web activities in overview mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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" 10 #include "base/memory/scoped_ptr.h"
(...skipping 16 matching lines...) Expand all
27 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE; 27 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;
28 virtual ActivityState GetCurrentState() OVERRIDE; 28 virtual ActivityState GetCurrentState() OVERRIDE;
29 virtual bool IsVisible() OVERRIDE; 29 virtual bool IsVisible() OVERRIDE;
30 virtual ActivityMediaState GetMediaState() OVERRIDE; 30 virtual ActivityMediaState GetMediaState() OVERRIDE;
31 virtual aura::Window* GetWindow() OVERRIDE; 31 virtual aura::Window* GetWindow() OVERRIDE;
32 32
33 // athena::ActivityViewModel: 33 // athena::ActivityViewModel:
34 virtual void Init() OVERRIDE; 34 virtual void Init() OVERRIDE;
35 virtual SkColor GetRepresentativeColor() const OVERRIDE; 35 virtual SkColor GetRepresentativeColor() const OVERRIDE;
36 virtual base::string16 GetTitle() const OVERRIDE; 36 virtual base::string16 GetTitle() const OVERRIDE;
37 virtual gfx::ImageSkia GetIcon() const OVERRIDE;
37 virtual bool UsesFrame() const OVERRIDE; 38 virtual bool UsesFrame() const OVERRIDE;
38 virtual views::View* GetContentsView() OVERRIDE; 39 virtual views::View* GetContentsView() OVERRIDE;
39 virtual views::Widget* CreateWidget() OVERRIDE; 40 virtual views::Widget* CreateWidget() OVERRIDE;
40 virtual void CreateOverviewModeImage() OVERRIDE; 41 virtual void CreateOverviewModeImage() OVERRIDE;
41 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 42 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
42 virtual void PrepareContentsForOverview() OVERRIDE; 43 virtual void PrepareContentsForOverview() OVERRIDE;
43 virtual void ResetContentsView() OVERRIDE; 44 virtual void ResetContentsView() OVERRIDE;
44 45
45 SkColor color_; 46 SkColor color_;
46 SkColor contents_color_; 47 SkColor contents_color_;
47 base::string16 title_; 48 base::string16 title_;
48 views::View* contents_view_; 49 views::View* contents_view_;
49 50
50 // The current state for this activity. 51 // The current state for this activity.
51 ActivityState current_state_; 52 ActivityState current_state_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(SampleActivity); 54 DISALLOW_COPY_AND_ASSIGN(SampleActivity);
54 }; 55 };
55 56
56 } // namespace test 57 } // namespace test
57 } // namespace athena 58 } // namespace athena
58 59
59 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_ 60 #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