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

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

Issue 694413005: athena: Introduce ActivityView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/base/sample_activity.h" 5 #include "athena/test/base/sample_activity.h"
6 6
7 #include "athena/input/public/accelerator_manager.h" 7 #include "athena/input/public/accelerator_manager.h"
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/background.h" 9 #include "ui/views/background.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 66
67 base::string16 SampleActivity::GetTitle() const { 67 base::string16 SampleActivity::GetTitle() const {
68 return title_; 68 return title_;
69 } 69 }
70 70
71 gfx::ImageSkia SampleActivity::GetIcon() const { 71 gfx::ImageSkia SampleActivity::GetIcon() const {
72 return gfx::ImageSkia(); 72 return gfx::ImageSkia();
73 } 73 }
74 74
75 void SampleActivity::SetActivityView(ActivityView* view) {
76 }
77
75 bool SampleActivity::UsesFrame() const { 78 bool SampleActivity::UsesFrame() const {
76 return true; 79 return true;
77 } 80 }
78 81
79 views::View* SampleActivity::GetContentsView() { 82 views::View* SampleActivity::GetContentsView() {
80 if (!contents_view_) { 83 if (!contents_view_) {
81 contents_view_ = new views::View; 84 contents_view_ = new views::View;
82 contents_view_->set_background( 85 contents_view_->set_background(
83 views::Background::CreateSolidBackground(contents_color_)); 86 views::Background::CreateSolidBackground(contents_color_));
84 } 87 }
85 return contents_view_; 88 return contents_view_;
86 } 89 }
87 90
88 gfx::ImageSkia SampleActivity::GetOverviewModeImage() { 91 gfx::ImageSkia SampleActivity::GetOverviewModeImage() {
89 return gfx::ImageSkia(); 92 return gfx::ImageSkia();
90 } 93 }
91 94
92 void SampleActivity::PrepareContentsForOverview() { 95 void SampleActivity::PrepareContentsForOverview() {
93 } 96 }
94 97
95 void SampleActivity::ResetContentsView() { 98 void SampleActivity::ResetContentsView() {
96 } 99 }
97 100
98 } // namespace test 101 } // namespace test
99 } // namespace athena 102 } // namespace athena
OLDNEW
« athena/content/web_activity.cc ('K') | « athena/test/base/sample_activity.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698