| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef ASH_COMMON_SYSTEM_DATE_SYSTEM_INFO_DEFAULT_VIEW_H_ | 5 #ifndef ASH_COMMON_SYSTEM_DATE_SYSTEM_INFO_DEFAULT_VIEW_H_ |
| 6 #define ASH_COMMON_SYSTEM_DATE_SYSTEM_INFO_DEFAULT_VIEW_H_ | 6 #define ASH_COMMON_SYSTEM_DATE_SYSTEM_INFO_DEFAULT_VIEW_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/common/login_status.h" | 9 #include "ash/common/login_status.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 #if defined(OS_CHROMEOS) | |
| 15 class PowerStatusView; | 14 class PowerStatusView; |
| 16 #endif // defined(OS_CHROMEOS) | |
| 17 class SystemTrayItem; | 15 class SystemTrayItem; |
| 18 class TriView; | 16 class TriView; |
| 19 | 17 |
| 20 namespace tray { | 18 namespace tray { |
| 21 class DateView; | 19 class DateView; |
| 22 } // namespace tray | 20 } // namespace tray |
| 23 | 21 |
| 24 // The default view for the system info row in the system menu. Contains the | 22 // The default view for the system info row in the system menu. Contains the |
| 25 // current date and, if a battery is present, a string showing the current | 23 // current date and, if a battery is present, a string showing the current |
| 26 // power status. | 24 // power status. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 41 | 39 |
| 42 // Computes and returns the width for |date_view_| so that the separator to | 40 // Computes and returns the width for |date_view_| so that the separator to |
| 43 // its right has the same x-position as a separator in the tiles row above. | 41 // its right has the same x-position as a separator in the tiles row above. |
| 44 // Depending on the width of the date string, we align the separator with | 42 // Depending on the width of the date string, we align the separator with |
| 45 // either the second or third separator in the tiles row (|kMinNumTileWidths| | 43 // either the second or third separator in the tiles row (|kMinNumTileWidths| |
| 46 // and |kMaxNumTileWidths| respectively. | 44 // and |kMaxNumTileWidths| respectively. |
| 47 static int CalculateDateViewWidth(int preferred_width); | 45 static int CalculateDateViewWidth(int preferred_width); |
| 48 | 46 |
| 49 tray::DateView* date_view_; | 47 tray::DateView* date_view_; |
| 50 | 48 |
| 51 #if defined(OS_CHROMEOS) | |
| 52 PowerStatusView* power_status_view_ = nullptr; | 49 PowerStatusView* power_status_view_ = nullptr; |
| 53 #endif // defined(OS_CHROMEOS) | |
| 54 | 50 |
| 55 TriView* tri_view_; | 51 TriView* tri_view_; |
| 56 | 52 |
| 57 DISALLOW_COPY_AND_ASSIGN(SystemInfoDefaultView); | 53 DISALLOW_COPY_AND_ASSIGN(SystemInfoDefaultView); |
| 58 }; | 54 }; |
| 59 | 55 |
| 60 } // namespace ash | 56 } // namespace ash |
| 61 | 57 |
| 62 #endif // ASH_COMMON_SYSTEM_DATE_SYSTEM_INFO_DEFAULT_VIEW_H_ | 58 #endif // ASH_COMMON_SYSTEM_DATE_SYSTEM_INFO_DEFAULT_VIEW_H_ |
| OLD | NEW |