ash/system/date/tray_date.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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/tray_date.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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/brightness/tray_brightness.cc ('k') | ash/system/drive/tray_drive.cc » ('j') | chrome/browser/resources_util.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/tray_date.h"	5 #include "ash/system/date/tray_date.h"

6	6

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

8 #include "ash/system/date/date_view.h"	8 #include "ash/system/date/date_view.h"

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

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

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

12 #include "ash/system/tray/tray_item_view.h"	12 #include "ash/system/tray/tray_item_view.h"

13 #include "ash/system/tray/tray_views.h"	13 #include "ash/system/tray/tray_views.h"

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

15 #include "base/stringprintf.h"	15 #include "base/stringprintf.h"

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

17 #include "base/timer.h"	17 #include "base/timer.h"

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

19 #include "grit/ui_resources_standard.h"	19 #include "grit/ui_resources.h"

20 #include "third_party/skia/include/core/SkRect.h"	20 #include "third_party/skia/include/core/SkRect.h"

21 #include "ui/base/resource/resource_bundle.h"	21 #include "ui/base/resource/resource_bundle.h"

22 #include "ui/gfx/image/image.h"	22 #include "ui/gfx/image/image.h"

23 #include "ui/gfx/image/image_skia.h"	23 #include "ui/gfx/image/image_skia.h"

24 #include "ui/gfx/size.h"	24 #include "ui/gfx/size.h"

25 #include "ui/views/controls/button/button.h"	25 #include "ui/views/controls/button/button.h"

26 #include "ui/views/controls/button/text_button.h"	26 #include "ui/views/controls/button/text_button.h"

27 #include "ui/views/controls/image_view.h"	27 #include "ui/views/controls/image_view.h"

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

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

(...skipping 155 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
185 }	185 }

186	186

187 void TrayDate::SetupLabelForTimeTray(views::Label* label) {	187 void TrayDate::SetupLabelForTimeTray(views::Label* label) {

188 SetupLabelForTray(label);	188 SetupLabelForTray(label);

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

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

191 }	191 }

192	192

193 } // namespace internal	193 } // namespace internal

194 } // namespace ash	194 } // namespace ash

OLD	NEW