ash/system/date/date_view.cc - Issue 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc}

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix browsertest Created 7 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/chromeos/tray_display.cc ('k') | ash/system/ime/tray_ime.cc » ('j') | ash/system/tray/hover_highlight_view.cc » ('J')

OLD	NEW
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/date_view.h"	5 #include "ash/system/date/date_view.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/system/tray/system_tray_delegate.h"	8 #include "ash/system/tray/system_tray_delegate.h"

9 #include "ash/system/tray/tray_constants.h"	9 #include "ash/system/tray/tray_constants.h"

10 #include "ash/system/tray/tray_views.h"	10 #include "ash/system/tray/tray_utils.h"

11 #include "base/i18n/time_formatting.h"	11 #include "base/i18n/time_formatting.h"

12 #include "base/time.h"	12 #include "base/time.h"

13 #include "base/utf_string_conversions.h"	13 #include "base/utf_string_conversions.h"

14 #include "grit/ash_strings.h"	14 #include "grit/ash_strings.h"

15 #include "third_party/icu/public/i18n/unicode/datefmt.h"	15 #include "third_party/icu/public/i18n/unicode/datefmt.h"

16 #include "third_party/icu/public/i18n/unicode/dtptngen.h"	16 #include "third_party/icu/public/i18n/unicode/dtptngen.h"

17 #include "third_party/icu/public/i18n/unicode/smpdtfmt.h"	17 #include "third_party/icu/public/i18n/unicode/smpdtfmt.h"

18 #include "ui/base/l10n/l10n_util.h"	18 #include "ui/base/l10n/l10n_util.h"

19 #include "ui/views/controls/label.h"	19 #include "ui/views/controls/label.h"

20 #include "ui/views/layout/box_layout.h"	20 #include "ui/views/layout/box_layout.h"

(...skipping 261 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
282 void TimeView::SetupLabel(views::Label* label) {	282 void TimeView::SetupLabel(views::Label* label) {

283 label->set_owned_by_client();	283 label->set_owned_by_client();

284 SetupLabelForTray(label);	284 SetupLabelForTray(label);

285 gfx::Font font = label->font();	285 gfx::Font font = label->font();

286 label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));	286 label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));

287 }	287 }

288	288

289 } // namespace tray	289 } // namespace tray

290 } // namespace internal	290 } // namespace internal

291 } // namespace ash	291 } // namespace ash

OLD	NEW