ash/system/power/power_status_view.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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/power/power_status_view.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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/power/power_status.cc ('k') | ash/system/power/tablet_power_button_controller.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/power/power_status_view.h"	5 #include "ash/system/power/power_status_view.h"

6	6

7 #include "ash/common/material_design/material_design_controller.h"	7 #include "ash/material_design/material_design_controller.h"

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

9 #include "ash/system/power/power_status.h"	9 #include "ash/system/power/power_status.h"

10 #include "ash/system/power/tray_power.h"	10 #include "ash/system/power/tray_power.h"

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

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

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

14 #include "ash/system/tray/tray_popup_utils.h"	14 #include "ash/system/tray/tray_popup_utils.h"

15 #include "base/i18n/number_formatting.h"	15 #include "base/i18n/number_formatting.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"

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167	167

168 void PowerStatusView::GetAccessibleNodeData(ui::AXNodeData* node_data) {	168 void PowerStatusView::GetAccessibleNodeData(ui::AXNodeData* node_data) {

169 if (!MaterialDesignController::IsSystemTrayMenuMaterial())	169 if (!MaterialDesignController::IsSystemTrayMenuMaterial())

170 return;	170 return;

171	171

172 node_data->role = ui::AX_ROLE_LABEL_TEXT;	172 node_data->role = ui::AX_ROLE_LABEL_TEXT;

173 node_data->SetName(accessible_name_);	173 node_data->SetName(accessible_name_);

174 }	174 }

175	175

176 } // namespace ash	176 } // namespace ash

OLD	NEW