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

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

Issue 247663003: Date and Time dialog for when the clock isn't synced. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, single quotes in browsertest js Created 6 years, 8 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/clock_observer.h ('k') | ash/system/date/date_view.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 "ash/system/date/date_default_view.h" 5 #include "ash/system/date/date_default_view.h"
6 6
7 #include "ash/metrics/user_metrics_recorder.h" 7 #include "ash/metrics/user_metrics_recorder.h"
8 #include "ash/session_state_delegate.h" 8 #include "ash/session_state_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/date/date_view.h" 10 #include "ash/system/date/date_view.h"
(...skipping 28 matching lines...) Expand all
39 date_view_->SetBorder(views::Border::CreateEmptyBorder( 39 date_view_->SetBorder(views::Border::CreateEmptyBorder(
40 kPaddingVertical, ash::kTrayPopupPaddingHorizontal, 0, 0)); 40 kPaddingVertical, ash::kTrayPopupPaddingHorizontal, 0, 0));
41 SpecialPopupRow* view = new SpecialPopupRow(); 41 SpecialPopupRow* view = new SpecialPopupRow();
42 view->SetContent(date_view_); 42 view->SetContent(date_view_);
43 AddChildView(view); 43 AddChildView(view);
44 44
45 if (login == ash::user::LOGGED_IN_LOCKED || 45 if (login == ash::user::LOGGED_IN_LOCKED ||
46 login == ash::user::LOGGED_IN_NONE) 46 login == ash::user::LOGGED_IN_NONE)
47 return; 47 return;
48 48
49 date_view_->SetActionable(true); 49 date_view_->SetAction(TrayDate::SHOW_DATE_SETTINGS);
50 50
51 help_ = new TrayPopupHeaderButton(this, 51 help_ = new TrayPopupHeaderButton(this,
52 IDR_AURA_UBER_TRAY_HELP, 52 IDR_AURA_UBER_TRAY_HELP,
53 IDR_AURA_UBER_TRAY_HELP, 53 IDR_AURA_UBER_TRAY_HELP,
54 IDR_AURA_UBER_TRAY_HELP_HOVER, 54 IDR_AURA_UBER_TRAY_HELP_HOVER,
55 IDR_AURA_UBER_TRAY_HELP_HOVER, 55 IDR_AURA_UBER_TRAY_HELP_HOVER,
56 IDS_ASH_STATUS_TRAY_HELP); 56 IDS_ASH_STATUS_TRAY_HELP);
57 help_->SetTooltipText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP)); 57 help_->SetTooltipText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP));
58 view->AddButton(help_); 58 view->AddButton(help_);
59 59
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 tray_delegate->ShutDown(); 111 tray_delegate->ShutDown();
112 } else if (sender == lock_) { 112 } else if (sender == lock_) {
113 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN); 113 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN);
114 tray_delegate->RequestLockScreen(); 114 tray_delegate->RequestLockScreen();
115 } else { 115 } else {
116 NOTREACHED(); 116 NOTREACHED();
117 } 117 }
118 } 118 }
119 119
120 } // namespace ash 120 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/clock_observer.h ('k') | ash/system/date/date_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698