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

Side by Side Diff: athena/content/app_activity_proxy.cc

Issue 550643002: [Athena] Hack to display favicons for web activities in overview mode (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/content/app_activity_proxy.h" 5 #include "athena/content/app_activity_proxy.h"
6 6
7 #include "athena/content/app_activity_registry.h" 7 #include "athena/content/app_activity_registry.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } 67 }
68 68
69 SkColor AppActivityProxy::GetRepresentativeColor() const { 69 SkColor AppActivityProxy::GetRepresentativeColor() const {
70 return color_; 70 return color_;
71 } 71 }
72 72
73 base::string16 AppActivityProxy::GetTitle() const { 73 base::string16 AppActivityProxy::GetTitle() const {
74 return title_; 74 return title_;
75 } 75 }
76 76
77 gfx::ImageSkia AppActivityProxy::GetIcon() const {
78 return gfx::ImageSkia();
79 }
80
77 bool AppActivityProxy::UsesFrame() const { 81 bool AppActivityProxy::UsesFrame() const {
78 return true; 82 return true;
79 } 83 }
80 84
81 views::View* AppActivityProxy::GetContentsView() { 85 views::View* AppActivityProxy::GetContentsView() {
82 return view_; 86 return view_;
83 } 87 }
84 88
85 void AppActivityProxy::CreateOverviewModeImage() { 89 void AppActivityProxy::CreateOverviewModeImage() {
86 // Nothing we can do here. 90 // Nothing we can do here.
87 } 91 }
88 92
89 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { 93 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() {
90 return image_; 94 return image_;
91 } 95 }
92 96
93 void AppActivityProxy::PrepareContentsForOverview() { 97 void AppActivityProxy::PrepareContentsForOverview() {
94 } 98 }
95 99
96 void AppActivityProxy::ResetContentsView() { 100 void AppActivityProxy::ResetContentsView() {
97 } 101 }
98 102
99 } // namespace athena 103 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698