| 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_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ | 5 #ifndef ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ |
| 6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ | 6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_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 "ash/common/shelf/shelf_background_animator_observer.h" | 10 #include "ash/common/shelf/shelf_background_animator_observer.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 StatusAreaWidgetDelegate* status_area_widget_delegate() { | 58 StatusAreaWidgetDelegate* status_area_widget_delegate() { |
| 59 return status_area_widget_delegate_; | 59 return status_area_widget_delegate_; |
| 60 } | 60 } |
| 61 SystemTray* system_tray() { return system_tray_; } | 61 SystemTray* system_tray() { return system_tray_; } |
| 62 WebNotificationTray* web_notification_tray() { | 62 WebNotificationTray* web_notification_tray() { |
| 63 return web_notification_tray_; | 63 return web_notification_tray_; |
| 64 } | 64 } |
| 65 OverviewButtonTray* overview_button_tray() { return overview_button_tray_; } | 65 OverviewButtonTray* overview_button_tray() { return overview_button_tray_; } |
| 66 | 66 |
| 67 #if defined(OS_CHROMEOS) | 67 #if defined(OS_CHROMEOS) |
| 68 PaletteTray* palette_tray() { return palette_tray_; } |
| 69 |
| 68 ImeMenuTray* ime_menu_tray_for_testing() { return ime_menu_tray_; } | 70 ImeMenuTray* ime_menu_tray_for_testing() { return ime_menu_tray_; } |
| 69 #endif | 71 #endif |
| 70 | 72 |
| 71 WmShelf* wm_shelf() { return wm_shelf_; } | 73 WmShelf* wm_shelf() { return wm_shelf_; } |
| 72 | 74 |
| 73 LoginStatus login_status() const { return login_status_; } | 75 LoginStatus login_status() const { return login_status_; } |
| 74 | 76 |
| 75 // Returns true if the shelf should be visible. This is used when the | 77 // Returns true if the shelf should be visible. This is used when the |
| 76 // shelf is configured to auto-hide and test if the shelf should force | 78 // shelf is configured to auto-hide and test if the shelf should force |
| 77 // the shelf to remain visible. | 79 // the shelf to remain visible. |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 LoginStatus login_status_; | 122 LoginStatus login_status_; |
| 121 | 123 |
| 122 WmShelf* wm_shelf_; | 124 WmShelf* wm_shelf_; |
| 123 | 125 |
| 124 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); | 126 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |
| 125 }; | 127 }; |
| 126 | 128 |
| 127 } // namespace ash | 129 } // namespace ash |
| 128 | 130 |
| 129 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ | 131 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ |
| OLD | NEW |