ash/system/tray/tray_utils.cc - Issue 2030593002: Renames ash/wm/common into ash/common/wm

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/tray/tray_utils.cc

Issue 2030593002: Renames ash/wm/common into ash/common/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/tray/tray_item_view.cc ('k') | ash/system/user/tray_user.cc » ('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/tray/tray_utils.h"	5 #include "ash/system/tray/tray_utils.h"

6	6

	7 #include "ash/common/wm/shelf/wm_shelf_util.h"

7 #include "ash/shelf/shelf_util.h"	8 #include "ash/shelf/shelf_util.h"

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

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

10 #include "ash/wm/common/shelf/wm_shelf_util.h"

11 #include "ui/accessibility/ax_view_state.h"	11 #include "ui/accessibility/ax_view_state.h"

12 #include "ui/gfx/font_list.h"	12 #include "ui/gfx/font_list.h"

13 #include "ui/gfx/geometry/vector2d.h"	13 #include "ui/gfx/geometry/vector2d.h"

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

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

16	16

17 namespace ash {	17 namespace ash {

18	18

19 void SetupLabelForTray(views::Label* label) {	19 void SetupLabelForTray(views::Label* label) {

20 label->SetFontList(gfx::FontList().Derive(1, gfx::Font::BOLD));	20 label->SetFontList(gfx::FontList().Derive(1, gfx::Font::BOLD));

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 // Do not descend into static text labels which may compute their own labels	69 // Do not descend into static text labels which may compute their own labels

70 // recursively.	70 // recursively.

71 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT)	71 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT)

72 return;	72 return;

73	73

74 for (int i = 0; i < view->child_count(); ++i)	74 for (int i = 0; i < view->child_count(); ++i)

75 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels);	75 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels);

76 }	76 }

77	77

78 } // namespace ash	78 } // namespace ash

OLD	NEW