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

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

Issue 702473005: athena: Remove ActivityViewModel::CreateWidget(). (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
« no previous file with comments | « athena/test/base/sample_activity.h ('k') | no next file » | 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 #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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 views::View* SampleActivity::GetContentsView() { 79 views::View* SampleActivity::GetContentsView() {
80 if (!contents_view_) { 80 if (!contents_view_) {
81 contents_view_ = new views::View; 81 contents_view_ = new views::View;
82 contents_view_->set_background( 82 contents_view_->set_background(
83 views::Background::CreateSolidBackground(contents_color_)); 83 views::Background::CreateSolidBackground(contents_color_));
84 } 84 }
85 return contents_view_; 85 return contents_view_;
86 } 86 }
87 87
88 views::Widget* SampleActivity::CreateWidget() {
89 return nullptr;
90 }
91
92 gfx::ImageSkia SampleActivity::GetOverviewModeImage() { 88 gfx::ImageSkia SampleActivity::GetOverviewModeImage() {
93 return gfx::ImageSkia(); 89 return gfx::ImageSkia();
94 } 90 }
95 91
96 void SampleActivity::PrepareContentsForOverview() { 92 void SampleActivity::PrepareContentsForOverview() {
97 } 93 }
98 94
99 void SampleActivity::ResetContentsView() { 95 void SampleActivity::ResetContentsView() {
100 } 96 }
101 97
102 } // namespace test 98 } // namespace test
103 } // namespace athena 99 } // namespace athena
OLDNEW
« no previous file with comments | « athena/test/base/sample_activity.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698