Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698