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

Side by Side Diff: ash/system/power/tray_power_date.cc

Issue 9580024: ash uber tray: Allow customizing each item depending on whether the user is logged in or not. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing file Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/power/tray_power_date.h ('k') | ash/system/settings/tray_settings.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/system/power/tray_power_date.h" 5 #include "ash/system/power/tray_power_date.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/power/power_supply_status.h" 8 #include "ash/system/power/power_supply_status.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 } // namespace tray 227 } // namespace tray
228 228
229 TrayPowerDate::TrayPowerDate() 229 TrayPowerDate::TrayPowerDate()
230 : power_(NULL), 230 : power_(NULL),
231 power_tray_(NULL) { 231 power_tray_(NULL) {
232 } 232 }
233 233
234 TrayPowerDate::~TrayPowerDate() { 234 TrayPowerDate::~TrayPowerDate() {
235 } 235 }
236 236
237 views::View* TrayPowerDate::CreateTrayView() { 237 views::View* TrayPowerDate::CreateTrayView(user::LoginStatus status) {
238 date_tray_.reset(new tray::DateView(base::k24HourClock, 238 date_tray_.reset(new tray::DateView(base::k24HourClock,
239 tray::DateView::TIME)); 239 tray::DateView::TIME));
240 date_tray_->SetFont(date_tray_->font().DeriveFont(-1, gfx::Font::BOLD)); 240 date_tray_->SetFont(date_tray_->font().DeriveFont(-1, gfx::Font::BOLD));
241 date_tray_->SetAutoColorReadabilityEnabled(false); 241 date_tray_->SetAutoColorReadabilityEnabled(false);
242 date_tray_->SetEnabledColor(SK_ColorWHITE); 242 date_tray_->SetEnabledColor(SK_ColorWHITE);
243 243
244 power_tray_.reset(new tray::PowerTrayView()); 244 power_tray_.reset(new tray::PowerTrayView());
245 245
246 views::View* container = new views::View; 246 views::View* container = new views::View;
247 container->SetLayoutManager(new views::BoxLayout( 247 container->SetLayoutManager(new views::BoxLayout(
248 views::BoxLayout::kHorizontal, 0, 0, 0)); 248 views::BoxLayout::kHorizontal, 0, 0, 0));
249 container->AddChildView(power_tray_.get()); 249 container->AddChildView(power_tray_.get());
250 container->AddChildView(date_tray_.get()); 250 container->AddChildView(date_tray_.get());
251 251
252 return container; 252 return container;
253 } 253 }
254 254
255 views::View* TrayPowerDate::CreateDefaultView() { 255 views::View* TrayPowerDate::CreateDefaultView(user::LoginStatus status) {
256 date_.reset(new tray::DateView(base::k24HourClock, 256 date_.reset(new tray::DateView(base::k24HourClock,
257 tray::DateView::DATE)); 257 tray::DateView::DATE));
258 power_.reset(new tray::PowerPopupView()); 258 power_.reset(new tray::PowerPopupView());
259 259
260 views::View* container = new views::View; 260 views::View* container = new views::View;
261 views::BoxLayout* layout = new 261 views::BoxLayout* layout = new
262 views::BoxLayout(views::BoxLayout::kHorizontal, 0, 10, 0); 262 views::BoxLayout(views::BoxLayout::kHorizontal, 0, 10, 0);
263 layout->set_spread_blank_space(true); 263 layout->set_spread_blank_space(true);
264 container->SetLayoutManager(layout); 264 container->SetLayoutManager(layout);
265 container->set_background(views::Background::CreateSolidBackground( 265 container->set_background(views::Background::CreateSolidBackground(
266 SkColorSetARGB(255, 240, 240, 240))); 266 SkColorSetARGB(255, 240, 240, 240)));
267 container->AddChildView(date_.get()); 267 container->AddChildView(date_.get());
268 container->AddChildView(power_.get()); 268 container->AddChildView(power_.get());
269 return container; 269 return container;
270 } 270 }
271 271
272 views::View* TrayPowerDate::CreateDetailedView() { 272 views::View* TrayPowerDate::CreateDetailedView(user::LoginStatus status) {
273 return NULL; 273 return NULL;
274 } 274 }
275 275
276 void TrayPowerDate::DestroyTrayView() { 276 void TrayPowerDate::DestroyTrayView() {
277 date_tray_.reset(); 277 date_tray_.reset();
278 power_tray_.reset(); 278 power_tray_.reset();
279 } 279 }
280 280
281 void TrayPowerDate::DestroyDefaultView() { 281 void TrayPowerDate::DestroyDefaultView() {
282 date_.reset(); 282 date_.reset();
283 power_.reset(); 283 power_.reset();
284 } 284 }
285 285
286 void TrayPowerDate::DestroyDetailedView() { 286 void TrayPowerDate::DestroyDetailedView() {
287 } 287 }
288 288
289 void TrayPowerDate::OnPowerStatusChanged(const PowerSupplyStatus& status) { 289 void TrayPowerDate::OnPowerStatusChanged(const PowerSupplyStatus& status) {
290 power_tray_->UpdatePowerStatus(status); 290 power_tray_->UpdatePowerStatus(status);
291 if (power_.get()) 291 if (power_.get())
292 power_->UpdatePowerStatus(status); 292 power_->UpdatePowerStatus(status);
293 } 293 }
294 294
295 } // namespace internal 295 } // namespace internal
296 } // namespace ash 296 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/power/tray_power_date.h ('k') | ash/system/settings/tray_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698