Chromium Code Reviews| Index: ash/system/status_area_widget.h |
| diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h |
| index 44dc754b984b70619aacf482058f833831364740..caed8b3653c468c8d36b8553e208ce535cb23c21 100644 |
| --- a/ash/system/status_area_widget.h |
| +++ b/ash/system/status_area_widget.h |
| @@ -72,7 +72,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget { |
| scoped_ptr<SystemTrayDelegate> system_tray_delegate_; |
| // Weak pointers to View classes that are parented to StatusAreaWidget: |
| - internal::StatusAreaWidgetDelegate* widget_delegate_; |
| + internal::StatusAreaWidgetDelegate* status_area_widget_delegate_; |
|
stevenjb
2012/08/06 23:33:53
Note: I discovered that this was shadowing Widget:
|
| SystemTray* system_tray_; |
| WebNotificationTray* web_notification_tray_; |
| user::LoginStatus login_status_; |