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

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

Issue 10809008: Make spacing between uber tray items consistent with UI spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 (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/system/tray/tray_image_item.h" 5 #include "ash/system/tray/tray_image_item.h"
6 6
7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h"
7 #include "ash/system/tray/tray_item_view.h" 9 #include "ash/system/tray/tray_item_view.h"
8 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/gfx/image/image.h" 11 #include "ui/gfx/image/image.h"
10 #include "ui/views/controls/image_view.h" 12 #include "ui/views/controls/image_view.h"
11 #include "ui/views/layout/fill_layout.h" 13 #include "ui/views/layout/fill_layout.h"
12 14
13 namespace ash { 15 namespace ash {
14 namespace internal { 16 namespace internal {
15 17
16 TrayImageItem::TrayImageItem(int resource_id) 18 TrayImageItem::TrayImageItem(int resource_id)
17 : resource_id_(resource_id), 19 : resource_id_(resource_id),
18 tray_view_(NULL) { 20 tray_view_(NULL) {
19 } 21 }
20 22
21 TrayImageItem::~TrayImageItem() {} 23 TrayImageItem::~TrayImageItem() {}
22 24
23 views::View* TrayImageItem::tray_view() { 25 views::View* TrayImageItem::tray_view() {
24 return tray_view_; 26 return tray_view_;
25 } 27 }
26 28
27 views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) { 29 views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
28 CHECK(tray_view_ == NULL); 30 CHECK(tray_view_ == NULL);
29 tray_view_ = new TrayItemView; 31 tray_view_ = new TrayItemView;
30 tray_view_->CreateImageView(); 32 tray_view_->CreateImageView();
31 tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance(). 33 tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance().
32 GetImageNamed(resource_id_).ToImageSkia()); 34 GetImageNamed(resource_id_).ToImageSkia());
33 tray_view_->SetVisible(GetInitialVisibility()); 35 tray_view_->SetVisible(GetInitialVisibility());
36 UpdateAfterShelfAlignmentChange(
37 ash::Shell::GetInstance()->system_tray()->shelf_alignment());
34 return tray_view_; 38 return tray_view_;
35 } 39 }
36 40
37 views::View* TrayImageItem::CreateDefaultView(user::LoginStatus status) { 41 views::View* TrayImageItem::CreateDefaultView(user::LoginStatus status) {
38 return NULL; 42 return NULL;
39 } 43 }
40 44
41 views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) { 45 views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) {
42 return NULL; 46 return NULL;
43 } 47 }
44 48
45 void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) { 49 void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) {
46 } 50 }
47 51
52 void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
53 SetTrayImageItemBorder(tray_view_, alignment);
54 }
55
48 void TrayImageItem::DestroyTrayView() { 56 void TrayImageItem::DestroyTrayView() {
49 tray_view_ = NULL; 57 tray_view_ = NULL;
50 } 58 }
51 59
52 void TrayImageItem::DestroyDefaultView() { 60 void TrayImageItem::DestroyDefaultView() {
53 } 61 }
54 62
55 void TrayImageItem::DestroyDetailedView() { 63 void TrayImageItem::DestroyDetailedView() {
56 } 64 }
57 65
58 } // namespace internal 66 } // namespace internal
59 } // namespace ash 67 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698