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

Side by Side Diff: ash/common/system/tray/tray_image_item.cc

Issue 2750263002: Remove ash tray utility functions that are no-ops in MD. (Closed)
Patch Set: Created 3 years, 9 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 | « ash/common/system/tray/tray_image_item.h ('k') | ash/common/system/tray/tray_utils.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/common/system/tray/tray_image_item.h" 5 #include "ash/common/system/tray/tray_image_item.h"
6 6
7 #include "ash/common/shelf/wm_shelf_util.h" 7 #include "ash/common/shelf/wm_shelf_util.h"
8 #include "ash/common/system/tray/system_tray.h" 8 #include "ash/common/system/tray/system_tray.h"
9 #include "ash/common/system/tray/tray_constants.h" 9 #include "ash/common/system/tray/tray_constants.h"
10 #include "ash/common/system/tray/tray_item_view.h" 10 #include "ash/common/system/tray/tray_item_view.h"
(...skipping 22 matching lines...) Expand all
33 33
34 views::View* TrayImageItem::CreateTrayView(LoginStatus status) { 34 views::View* TrayImageItem::CreateTrayView(LoginStatus status) {
35 CHECK(!tray_view_); 35 CHECK(!tray_view_);
36 tray_view_ = new TrayItemView(this); 36 tray_view_ = new TrayItemView(this);
37 tray_view_->CreateImageView(); 37 tray_view_->CreateImageView();
38 UpdateImageOnImageView(); 38 UpdateImageOnImageView();
39 tray_view_->SetVisible(GetInitialVisibility()); 39 tray_view_->SetVisible(GetInitialVisibility());
40 return tray_view_; 40 return tray_view_;
41 } 41 }
42 42
43 views::View* TrayImageItem::CreateDefaultView(LoginStatus status) {
44 return nullptr;
45 }
46
47 views::View* TrayImageItem::CreateDetailedView(LoginStatus status) {
48 return nullptr;
49 }
50
51 void TrayImageItem::UpdateAfterLoginStatusChange(LoginStatus status) {}
52
53 void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
54 SetTrayImageItemBorder(tray_view_, alignment);
55 }
56
57 void TrayImageItem::DestroyTrayView() { 43 void TrayImageItem::DestroyTrayView() {
58 tray_view_ = nullptr; 44 tray_view_ = nullptr;
59 } 45 }
60 46
61 void TrayImageItem::DestroyDefaultView() {}
62
63 void TrayImageItem::DestroyDetailedView() {}
64
65 void TrayImageItem::SetIconColor(SkColor color) { 47 void TrayImageItem::SetIconColor(SkColor color) {
66 icon_color_ = color; 48 icon_color_ = color;
67 UpdateImageOnImageView(); 49 UpdateImageOnImageView();
68 } 50 }
69 51
70 void TrayImageItem::UpdateImageOnImageView() { 52 void TrayImageItem::UpdateImageOnImageView() {
71 if (!tray_view_) 53 if (!tray_view_)
72 return; 54 return;
73 55
74 tray_view_->image_view()->SetImage( 56 tray_view_->image_view()->SetImage(
75 gfx::CreateVectorIcon(icon_, kTrayIconSize, icon_color_)); 57 gfx::CreateVectorIcon(icon_, kTrayIconSize, icon_color_));
76 } 58 }
77 59
78 } // namespace ash 60 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_image_item.h ('k') | ash/common/system/tray/tray_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698