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

Side by Side Diff: ash/system/date/tray_date.cc

Issue 10209038: ash: Add vertical spacing to multi-line text in tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 7 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
« no previous file with comments | « ash/system/date/tray_date.h ('k') | ash/system/power/tray_power.cc » ('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/system/date/tray_date.h" 5 #include "ash/system/date/tray_date.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/date/date_view.h" 8 #include "ash/system/date/date_view.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
(...skipping 24 matching lines...) Expand all
35 namespace ash { 35 namespace ash {
36 namespace internal { 36 namespace internal {
37 37
38 TrayDate::TrayDate() { 38 TrayDate::TrayDate() {
39 } 39 }
40 40
41 TrayDate::~TrayDate() { 41 TrayDate::~TrayDate() {
42 } 42 }
43 43
44 views::View* TrayDate::CreateTrayView(user::LoginStatus status) { 44 views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
45 date_tray_.reset(new tray::DateView(tray::DateView::TIME)); 45 time_tray_.reset(new tray::TimeView());
46 date_tray_->set_border( 46 time_tray_->set_border(
47 views::Border::CreateEmptyBorder(0, 10, 0, 7)); 47 views::Border::CreateEmptyBorder(0, 10, 0, 7));
48 SetupLabelForTray(date_tray_->label()); 48 SetupLabelForTray(time_tray_->label());
49 gfx::Font font = date_tray_->label()->font(); 49 gfx::Font font = time_tray_->label()->font();
50 date_tray_->label()->SetFont( 50 time_tray_->label()->SetFont(
51 font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD)); 51 font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
52 52
53 views::View* view = new TrayItemView; 53 views::View* view = new TrayItemView;
54 view->AddChildView(date_tray_.get()); 54 view->AddChildView(time_tray_.get());
55 return view; 55 return view;
56 } 56 }
57 57
58 views::View* TrayDate::CreateDefaultView(user::LoginStatus status) { 58 views::View* TrayDate::CreateDefaultView(user::LoginStatus status) {
59 return NULL; 59 return NULL;
60 } 60 }
61 61
62 views::View* TrayDate::CreateDetailedView(user::LoginStatus status) { 62 views::View* TrayDate::CreateDetailedView(user::LoginStatus status) {
63 return NULL; 63 return NULL;
64 } 64 }
65 65
66 void TrayDate::DestroyTrayView() { 66 void TrayDate::DestroyTrayView() {
67 date_tray_.reset(); 67 time_tray_.reset();
68 } 68 }
69 69
70 void TrayDate::DestroyDefaultView() { 70 void TrayDate::DestroyDefaultView() {
71 } 71 }
72 72
73 void TrayDate::DestroyDetailedView() { 73 void TrayDate::DestroyDetailedView() {
74 } 74 }
75 75
76 void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) { 76 void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) {
77 } 77 }
78 78
79 void TrayDate::OnDateFormatChanged() { 79 void TrayDate::OnDateFormatChanged() {
80 date_tray_->UpdateTimeFormat(); 80 time_tray_->UpdateTimeFormat();
81 } 81 }
82 82
83 void TrayDate::Refresh() { 83 void TrayDate::Refresh() {
84 date_tray_->UpdateText(); 84 time_tray_->UpdateText();
85 } 85 }
86 86
87 } // namespace internal 87 } // namespace internal
88 } // namespace ash 88 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/tray_date.h ('k') | ash/system/power/tray_power.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698