ash/system/date/date_view.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 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

« no previous file with comments | « ash/system/date/date_default_view.cc ('k') | ash/system/date/system_info_default_view.h » ('j') | no next file with comments »

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/material_design/material_design_controller.h"	7 #include "ash/common/material_design/material_design_controller.h"

	8 #include "ash/common/wm_shell.h"

8 #include "ash/strings/grit/ash_strings.h"	9 #include "ash/strings/grit/ash_strings.h"

9 #include "ash/system/tray/system_tray_controller.h"	10 #include "ash/system/tray/system_tray_controller.h"

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

11 #include "ash/system/tray/tray_popup_item_style.h"	12 #include "ash/system/tray/tray_popup_item_style.h"

12 #include "ash/system/tray/tray_popup_utils.h"	13 #include "ash/system/tray/tray_popup_utils.h"

13 #include "ash/system/tray/tray_utils.h"	14 #include "ash/system/tray/tray_utils.h"

14 #include "ash/wm_shell.h"

15 #include "base/i18n/rtl.h"	15 #include "base/i18n/rtl.h"

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

17 #include "base/strings/utf_string_conversions.h"	17 #include "base/strings/utf_string_conversions.h"

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

19 #include "third_party/icu/source/i18n/unicode/datefmt.h"	19 #include "third_party/icu/source/i18n/unicode/datefmt.h"

20 #include "third_party/icu/source/i18n/unicode/dtptngen.h"	20 #include "third_party/icu/source/i18n/unicode/dtptngen.h"

21 #include "third_party/icu/source/i18n/unicode/smpdtfmt.h"	21 #include "third_party/icu/source/i18n/unicode/smpdtfmt.h"

22 #include "ui/accessibility/ax_node_data.h"	22 #include "ui/accessibility/ax_node_data.h"

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

24 #include "ui/views/border.h"	24 #include "ui/views/border.h"

(...skipping 374 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
399 }	399 }

400	400

401 void TimeView::SetupLabel(views::Label* label) {	401 void TimeView::SetupLabel(views::Label* label) {

402 label->set_owned_by_client();	402 label->set_owned_by_client();

403 SetupLabelForTray(label);	403 SetupLabelForTray(label);

404 label->SetElideBehavior(gfx::NO_ELIDE);	404 label->SetElideBehavior(gfx::NO_ELIDE);

405 }	405 }

406	406

407 } // namespace tray	407 } // namespace tray

408 } // namespace ash	408 } // namespace ash

OLD	NEW