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

Side by Side Diff: ash/system/date/date_view.h

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.cc ('k') | ash/system/date/date_view.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 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_ 5 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_
6 #define ASH_SYSTEM_DATE_DATE_VIEW_H_ 6 #define ASH_SYSTEM_DATE_DATE_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/date/tray_date.h" 9 #include "ash/system/date/tray_date.h"
10 #include "ash/system/tray/actionable_view.h" 10 #include "ash/system/tray/actionable_view.h"
11 #include "base/i18n/time_formatting.h" 11 #include "base/i18n/time_formatting.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "ui/views/view.h" 14 #include "ui/views/view.h"
15 15
16 namespace views { 16 namespace views {
17 class Label; 17 class Label;
18 } 18 }
19 19
20 namespace ash { 20 namespace ash {
21 namespace internal {
22 namespace tray { 21 namespace tray {
23 22
24 // Abstract base class containing common updating and layout code for the 23 // Abstract base class containing common updating and layout code for the
25 // DateView popup and the TimeView tray icon. Exported for tests. 24 // DateView popup and the TimeView tray icon. Exported for tests.
26 class ASH_EXPORT BaseDateTimeView : public ActionableView { 25 class ASH_EXPORT BaseDateTimeView : public ActionableView {
27 public: 26 public:
28 virtual ~BaseDateTimeView(); 27 virtual ~BaseDateTimeView();
29 28
30 // Updates the displayed text for the current time and calls SetTimer(). 29 // Updates the displayed text for the current time and calls SetTimer().
31 void UpdateText(); 30 void UpdateText();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 // The time label is split into two lines for the vertical shelf. 123 // The time label is split into two lines for the vertical shelf.
125 scoped_ptr<views::Label> vertical_label_hours_; 124 scoped_ptr<views::Label> vertical_label_hours_;
126 scoped_ptr<views::Label> vertical_label_minutes_; 125 scoped_ptr<views::Label> vertical_label_minutes_;
127 126
128 base::HourClockType hour_type_; 127 base::HourClockType hour_type_;
129 128
130 DISALLOW_COPY_AND_ASSIGN(TimeView); 129 DISALLOW_COPY_AND_ASSIGN(TimeView);
131 }; 130 };
132 131
133 } // namespace tray 132 } // namespace tray
134 } // namespace internal
135 } // namespace ash 133 } // namespace ash
136 134
137 #endif // ASH_SYSTEM_DATE_DATE_VIEW_H_ 135 #endif // ASH_SYSTEM_DATE_DATE_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/date/date_default_view.cc ('k') | ash/system/date/date_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698