ash/system/date/tray_date.cc - Issue 12390049: views: Migrate ash_shell buttons to LabelButton

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 12390049: views: Migrate ash_shell buttons to LabelButton (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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

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"

(...skipping 11 matching lines...) Expand all Loading...
22 #include "third_party/icu/public/i18n/unicode/datefmt.h"	22 #include "third_party/icu/public/i18n/unicode/datefmt.h"

23 #include "third_party/icu/public/i18n/unicode/fieldpos.h"	23 #include "third_party/icu/public/i18n/unicode/fieldpos.h"

24 #include "third_party/icu/public/i18n/unicode/fmtable.h"	24 #include "third_party/icu/public/i18n/unicode/fmtable.h"

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

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

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

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

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

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

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

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

33 #include "ui/views/controls/image_view.h"	32 #include "ui/views/controls/image_view.h"

34 #include "ui/views/controls/label.h"	33 #include "ui/views/controls/label.h"

35 #include "ui/views/layout/box_layout.h"	34 #include "ui/views/layout/box_layout.h"

36 #include "ui/views/layout/fill_layout.h"	35 #include "ui/views/layout/fill_layout.h"

37 #include "ui/views/painter.h"	36 #include "ui/views/painter.h"

38 #include "ui/views/view.h"	37 #include "ui/views/view.h"

39 #include "ui/views/widget/widget.h"	38 #include "ui/views/widget/widget.h"

40	39

41 namespace {	40 namespace {

42	41

(...skipping 146 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 time_tray_->UpdateTimeFormat();	188 time_tray_->UpdateTimeFormat();

190 }	189 }

191	190

192 void TrayDate::Refresh() {	191 void TrayDate::Refresh() {

193 if (time_tray_)	192 if (time_tray_)

194 time_tray_->UpdateText();	193 time_tray_->UpdateText();

195 }	194 }

196	195

197 } // namespace internal	196 } // namespace internal

198 } // namespace ash	197 } // namespace ash

OLD	NEW

« ash/shell/window_type_launcher.cc ('K') | « ash/shell/window_type_launcher.cc ('k') | ash/system/power/tray_power.cc » ('j') | no next file with comments »