| 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 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ | 5 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| 6 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ | 6 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 bool GetDisplayMessageForNotification( | 53 bool GetDisplayMessageForNotification( |
| 54 const DisplayInfoMap& old_info, | 54 const DisplayInfoMap& old_info, |
| 55 base::string16* message_out, | 55 base::string16* message_out, |
| 56 base::string16* additional_message_out); | 56 base::string16* additional_message_out); |
| 57 | 57 |
| 58 // Creates or updates the display notification. | 58 // Creates or updates the display notification. |
| 59 void CreateOrUpdateNotification(const base::string16& message, | 59 void CreateOrUpdateNotification(const base::string16& message, |
| 60 const base::string16& additional_message); | 60 const base::string16& additional_message); |
| 61 | 61 |
| 62 // Overridden from SystemTrayItem. | 62 // Overridden from SystemTrayItem. |
| 63 views::View* CreateDefaultView(user::LoginStatus status) override; | 63 views::View* CreateDefaultView(LoginStatus status) override; |
| 64 void DestroyDefaultView() override; | 64 void DestroyDefaultView() override; |
| 65 | 65 |
| 66 // Test accessors. | 66 // Test accessors. |
| 67 base::string16 GetDefaultViewMessage() const; | 67 base::string16 GetDefaultViewMessage() const; |
| 68 bool GetAccessibleStateForTesting(ui::AXViewState* state); | 68 bool GetAccessibleStateForTesting(ui::AXViewState* state); |
| 69 const views::View* default_view() const { | 69 const views::View* default_view() const { |
| 70 return reinterpret_cast<views::View*>(default_); | 70 return reinterpret_cast<views::View*>(default_); |
| 71 } | 71 } |
| 72 | 72 |
| 73 DisplayView* default_; | 73 DisplayView* default_; |
| 74 DisplayInfoMap display_info_; | 74 DisplayInfoMap display_info_; |
| 75 | 75 |
| 76 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); | 76 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); |
| 77 }; | 77 }; |
| 78 | 78 |
| 79 } // namespace ash | 79 } // namespace ash |
| 80 | 80 |
| 81 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ | 81 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| OLD | NEW |