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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/date_default_view.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"
11 #include "ash/system/tray/special_popup_row.h" 11 #include "ash/system/tray/special_popup_row.h"
12 #include "ash/system/tray/system_tray_delegate.h" 12 #include "ash/system/tray/system_tray_delegate.h"
13 #include "ash/system/tray/tray_constants.h" 13 #include "ash/system/tray/tray_constants.h"
14 #include "ash/system/tray/tray_popup_header_button.h" 14 #include "ash/system/tray/tray_popup_header_button.h"
15 #include "grit/ash_resources.h" 15 #include "grit/ash_resources.h"
16 #include "grit/ash_strings.h" 16 #include "grit/ash_strings.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/views/border.h" 18 #include "ui/views/border.h"
19 #include "ui/views/controls/button/button.h" 19 #include "ui/views/controls/button/button.h"
20 #include "ui/views/layout/fill_layout.h" 20 #include "ui/views/layout/fill_layout.h"
21 #include "ui/views/view.h" 21 #include "ui/views/view.h"
22 22
23 namespace { 23 namespace {
24 24
25 const int kPaddingVertical = 19; 25 const int kPaddingVertical = 19;
26 26
27 } // namespace 27 } // namespace
28 28
29 namespace ash { 29 namespace ash {
30 namespace internal {
31 30
32 DateDefaultView::DateDefaultView(ash::user::LoginStatus login) 31 DateDefaultView::DateDefaultView(ash::user::LoginStatus login)
33 : help_(NULL), 32 : help_(NULL),
34 shutdown_(NULL), 33 shutdown_(NULL),
35 lock_(NULL), 34 lock_(NULL),
36 date_view_(NULL) { 35 date_view_(NULL) {
37 SetLayoutManager(new views::FillLayout); 36 SetLayoutManager(new views::FillLayout);
38 37
39 date_view_ = new tray::DateView(); 38 date_view_ = new tray::DateView();
40 date_view_->SetBorder(views::Border::CreateEmptyBorder( 39 date_view_->SetBorder(views::Border::CreateEmptyBorder(
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_SHUT_DOWN); 110 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_SHUT_DOWN);
112 tray_delegate->ShutDown(); 111 tray_delegate->ShutDown();
113 } else if (sender == lock_) { 112 } else if (sender == lock_) {
114 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN); 113 shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN);
115 tray_delegate->RequestLockScreen(); 114 tray_delegate->RequestLockScreen();
116 } else { 115 } else {
117 NOTREACHED(); 116 NOTREACHED();
118 } 117 }
119 } 118 }
120 119
121 } // namespace internal
122 } // namespace ash 120 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/date/date_default_view.h ('k') | ash/system/date/date_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698