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

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

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: 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
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 #include "athena/test/sample_activity.h" 5 #include "athena/test/sample_activity.h"
6 6
7 #include "ui/views/background.h" 7 #include "ui/views/background.h"
8 #include "ui/views/view.h" 8 #include "ui/views/view.h"
9 #include "ui/views/widget/widget.h" 9 #include "ui/views/widget/widget.h"
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 views::View* SampleActivity::GetContentsView() { 67 views::View* SampleActivity::GetContentsView() {
68 if (!contents_view_) { 68 if (!contents_view_) {
69 contents_view_ = new views::View; 69 contents_view_ = new views::View;
70 contents_view_->set_background( 70 contents_view_->set_background(
71 views::Background::CreateSolidBackground(contents_color_)); 71 views::Background::CreateSolidBackground(contents_color_));
72 } 72 }
73 return contents_view_; 73 return contents_view_;
74 } 74 }
75 75
76 void SampleActivity::CreateOverviewModeImage() {
77 }
78
79 gfx::ImageSkia SampleActivity::GetOverviewModeImage() { 76 gfx::ImageSkia SampleActivity::GetOverviewModeImage() {
80 return gfx::ImageSkia(); 77 return gfx::ImageSkia();
81 } 78 }
82 79
83 void SampleActivity::PrepareContentsForOverview() { 80 void SampleActivity::PrepareContentsForOverview() {
84 } 81 }
85 82
86 void SampleActivity::ResetContentsView() { 83 void SampleActivity::ResetContentsView() {
87 } 84 }
88 85
89 } // namespace test 86 } // namespace test
90 } // namespace athena 87 } // namespace athena
OLDNEW
« athena/content/content_proxy.cc ('K') | « athena/test/sample_activity.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698