| 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_STATUS_AREA_WIDGET_H_ |    5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_H_ | 
|    6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |    6 #define ASH_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_types.h" |   10 #include "ash/common/shelf/shelf_types.h" | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   47   // notification tray. |   47   // notification tray. | 
|   48   void UpdateAfterLoginStatusChange(LoginStatus login_status); |   48   void UpdateAfterLoginStatusChange(LoginStatus login_status); | 
|   49  |   49  | 
|   50   StatusAreaWidgetDelegate* status_area_widget_delegate() { |   50   StatusAreaWidgetDelegate* status_area_widget_delegate() { | 
|   51     return status_area_widget_delegate_; |   51     return status_area_widget_delegate_; | 
|   52   } |   52   } | 
|   53   SystemTray* system_tray() { return system_tray_; } |   53   SystemTray* system_tray() { return system_tray_; } | 
|   54   WebNotificationTray* web_notification_tray() { |   54   WebNotificationTray* web_notification_tray() { | 
|   55     return web_notification_tray_; |   55     return web_notification_tray_; | 
|   56   } |   56   } | 
|   57   OverviewButtonTray* overview_button_tray() { |   57   OverviewButtonTray* overview_button_tray() { return overview_button_tray_; } | 
|   58     return overview_button_tray_; |  | 
|   59   } |  | 
|   60   WmShelf* wm_shelf() { return wm_shelf_; } |   58   WmShelf* wm_shelf() { return wm_shelf_; } | 
|   61  |   59  | 
|   62   LoginStatus login_status() const { return login_status_; } |   60   LoginStatus login_status() const { return login_status_; } | 
|   63  |   61  | 
|   64   // Returns true if the shelf should be visible. This is used when the |   62   // Returns true if the shelf should be visible. This is used when the | 
|   65   // shelf is configured to auto-hide and test if the shelf should force |   63   // shelf is configured to auto-hide and test if the shelf should force | 
|   66   // the shelf to remain visible. |   64   // the shelf to remain visible. | 
|   67   bool ShouldShowShelf() const; |   65   bool ShouldShowShelf() const; | 
|   68  |   66  | 
|   69   // True if any message bubble is shown. |   67   // True if any message bubble is shown. | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
|   99   LoginStatus login_status_; |   97   LoginStatus login_status_; | 
|  100  |   98  | 
|  101   WmShelf* wm_shelf_; |   99   WmShelf* wm_shelf_; | 
|  102  |  100  | 
|  103   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |  101   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); | 
|  104 }; |  102 }; | 
|  105  |  103  | 
|  106 }  // namespace ash |  104 }  // namespace ash | 
|  107  |  105  | 
|  108 #endif  // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |  106 #endif  // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ | 
| OLD | NEW |