| Index: ash/system/locale/tray_locale.h
|
| diff --git a/ash/system/locale/tray_locale.h b/ash/system/locale/tray_locale.h
|
| index c0d114cc30ddfd09d9ba1b8f7b4ca1bdbd098ff6..230ba7b30684e0b08ae135bc6ec9fdf559585e42 100644
|
| --- a/ash/system/locale/tray_locale.h
|
| +++ b/ash/system/locale/tray_locale.h
|
| @@ -9,7 +9,7 @@
|
| #include <string>
|
|
|
| #include "ash/system/locale/locale_observer.h"
|
| -#include "ash/system/tray/tray_image_item.h"
|
| +#include "ash/system/tray/system_tray_item.h"
|
|
|
| namespace ash {
|
| namespace internal {
|
| @@ -18,7 +18,7 @@ namespace tray {
|
| class LocaleNotificationView;
|
| }
|
|
|
| -class TrayLocale : public TrayImageItem,
|
| +class TrayLocale : public SystemTrayItem,
|
| public LocaleObserver {
|
| public:
|
| TrayLocale();
|
| @@ -26,7 +26,6 @@ class TrayLocale : public TrayImageItem,
|
|
|
| private:
|
| // Overridden from TrayImageItem.
|
| - virtual bool GetInitialVisibility() OVERRIDE;
|
| virtual views::View* CreateNotificationView(
|
| user::LoginStatus status) OVERRIDE;
|
| virtual void DestroyNotificationView() OVERRIDE;
|
|
|