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

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
« no previous file with comments | « athena/content/app_activity_proxy.h ('k') | athena/content/web_activity.h » ('j') | 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/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 "athena/wm/public/window_list_provider.h" 8 #include "athena/wm/public/window_list_provider.h"
9 #include "athena/wm/public/window_manager.h" 9 #include "athena/wm/public/window_manager.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } 69 }
70 70
71 SkColor AppActivityProxy::GetRepresentativeColor() const { 71 SkColor AppActivityProxy::GetRepresentativeColor() const {
72 return color_; 72 return color_;
73 } 73 }
74 74
75 base::string16 AppActivityProxy::GetTitle() const { 75 base::string16 AppActivityProxy::GetTitle() const {
76 return title_; 76 return title_;
77 } 77 }
78 78
79 gfx::ImageSkia AppActivityProxy::GetIcon() const {
80 return gfx::ImageSkia();
81 }
82
79 bool AppActivityProxy::UsesFrame() const { 83 bool AppActivityProxy::UsesFrame() const {
80 return true; 84 return true;
81 } 85 }
82 86
83 views::View* AppActivityProxy::GetContentsView() { 87 views::View* AppActivityProxy::GetContentsView() {
84 return view_; 88 return view_;
85 } 89 }
86 90
87 views::Widget* AppActivityProxy::CreateWidget() { 91 views::Widget* AppActivityProxy::CreateWidget() {
88 return NULL; 92 return NULL;
89 } 93 }
90 94
91 void AppActivityProxy::CreateOverviewModeImage() { 95 void AppActivityProxy::CreateOverviewModeImage() {
92 // Nothing we can do here. 96 // Nothing we can do here.
93 } 97 }
94 98
95 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { 99 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() {
96 return image_; 100 return image_;
97 } 101 }
98 102
99 void AppActivityProxy::PrepareContentsForOverview() { 103 void AppActivityProxy::PrepareContentsForOverview() {
100 } 104 }
101 105
102 void AppActivityProxy::ResetContentsView() { 106 void AppActivityProxy::ResetContentsView() {
103 } 107 }
104 108
105 } // namespace athena 109 } // namespace athena
OLDNEW
« no previous file with comments | « athena/content/app_activity_proxy.h ('k') | athena/content/web_activity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698