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/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_delegate.h" | 8 #include "ash/shell_delegate.h" |
9 #include "ash/system/power/tray_power.h" | 9 #include "ash/system/power/tray_power.h" |
10 #include "ash/system/tray/fixed_sized_image_view.h" | 10 #include "ash/system/tray/fixed_sized_image_view.h" |
11 #include "ash/system/tray/tray_constants.h" | 11 #include "ash/system/tray/tray_constants.h" |
12 #include "ash/system/tray/tray_views.h" | |
13 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
14 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
15 #include "grit/ash_strings.h" | 14 #include "grit/ash_strings.h" |
16 #include "ui/base/l10n/l10n_util.h" | 15 #include "ui/base/l10n/l10n_util.h" |
17 #include "ui/base/resource/resource_bundle.h" | 16 #include "ui/base/resource/resource_bundle.h" |
18 #include "ui/views/controls/image_view.h" | 17 #include "ui/views/controls/image_view.h" |
19 #include "ui/views/controls/label.h" | 18 #include "ui/views/controls/label.h" |
20 #include "ui/views/layout/box_layout.h" | 19 #include "ui/views/layout/box_layout.h" |
21 #include "ui/views/layout/grid_layout.h" | 20 #include "ui/views/layout/grid_layout.h" |
22 | 21 |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 | 273 |
275 // Move the time_status_label_ closer to percentage_label_. | 274 // Move the time_status_label_ closer to percentage_label_. |
276 if (percentage_label_ && time_status_label_ && | 275 if (percentage_label_ && time_status_label_ && |
277 percentage_label_->visible() && time_status_label_->visible()) { | 276 percentage_label_->visible() && time_status_label_->visible()) { |
278 time_status_label_->SetX(percentage_label_->bounds().right() + 1); | 277 time_status_label_->SetX(percentage_label_->bounds().right() + 1); |
279 } | 278 } |
280 } | 279 } |
281 | 280 |
282 } // namespace internal | 281 } // namespace internal |
283 } // namespace ash | 282 } // namespace ash |
OLD | NEW |