athena/test/sample_activity.h - Issue 518673007: Make activities have a thick border when in overview mode part 1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 518673007: Make activities have a thick border when in overview mode part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_overview2

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

« athena/resource_manager/resource_manager_unittest.cc ('K') | « athena/resource_manager/resource_manager_unittest.cc ('k') | athena/test/sample_activity.cc » ('j') | athena/test/sample_activity.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_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 18 matching lines...) Expand all Loading...
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 bool UsesFrame() const OVERRIDE;	37 virtual bool UsesFrame() const OVERRIDE;

38 virtual views::View* GetContentsView() OVERRIDE;	38 virtual views::View* GetContentsView() OVERRIDE;

	39 virtual void PrepareContentsForOverview() OVERRIDE;

	40 virtual void ResetContentsView() OVERRIDE;

39 virtual void CreateOverviewModeImage() OVERRIDE;	41 virtual void CreateOverviewModeImage() OVERRIDE;

40 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;	42 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;

41	43

42 SkColor color_;	44 SkColor color_;

43 SkColor contents_color_;	45 SkColor contents_color_;

44 base::string16 title_;	46 base::string16 title_;

45 views::View* contents_view_;	47 views::View* contents_view_;

46	48

47 // The current state for this activity.	49 // The current state for this activity.

48 ActivityState current_state_;	50 ActivityState current_state_;

49	51

50 DISALLOW_COPY_AND_ASSIGN(SampleActivity);	52 DISALLOW_COPY_AND_ASSIGN(SampleActivity);

51 };	53 };

52	54

53 } // namespace test	55 } // namespace test

54 } // namespace athena	56 } // namespace athena

55	57

56 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_	58 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_

OLD	NEW