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

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

Issue 332443005: Enable accelerators on web activity window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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 9
10 namespace athena { 10 namespace athena {
11 namespace test { 11 namespace test {
12 12
13 SampleActivity::SampleActivity(SkColor color, 13 SampleActivity::SampleActivity(SkColor color,
14 SkColor contents_color, 14 SkColor contents_color,
15 const base::string16& title) 15 const base::string16& title)
16 : color_(color), 16 : color_(color),
17 contents_color_(contents_color), 17 contents_color_(contents_color),
18 title_(title), 18 title_(title),
19 contents_view_(NULL) { 19 contents_view_(NULL) {
20 } 20 }
21 21
22 SampleActivity::~SampleActivity() { 22 SampleActivity::~SampleActivity() {
23 } 23 }
24 24
25 athena::ActivityViewModel* SampleActivity::GetActivityViewModel() { 25 athena::ActivityViewModel* SampleActivity::GetActivityViewModel() {
26 return this; 26 return this;
27 } 27 }
28 28
29 void SampleActivity::Init() {
30 }
31
29 SkColor SampleActivity::GetRepresentativeColor() { 32 SkColor SampleActivity::GetRepresentativeColor() {
30 return color_; 33 return color_;
31 } 34 }
32 35
33 base::string16 SampleActivity::GetTitle() { 36 base::string16 SampleActivity::GetTitle() {
34 return title_; 37 return title_;
35 } 38 }
36 39
37 views::View* SampleActivity::GetContentsView() { 40 views::View* SampleActivity::GetContentsView() {
38 if (!contents_view_) { 41 if (!contents_view_) {
39 contents_view_ = new views::View; 42 contents_view_ = new views::View;
40 contents_view_->set_background( 43 contents_view_->set_background(
41 views::Background::CreateSolidBackground(contents_color_)); 44 views::Background::CreateSolidBackground(contents_color_));
42 } 45 }
43 return contents_view_; 46 return contents_view_;
44 } 47 }
45 48
46 } // namespace test 49 } // namespace test
47 } // namespace athena 50 } // namespace athena
OLDNEW
« athena/input/accelerator_manager_impl.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