Chromium Code Reviews| Index: ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h |
| diff --git a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h |
| index a52dc196692e01adee8399fb0d4c540e62bff8c6..22f0ed297731da5e75d33648d46d82829b4a55b4 100644 |
| --- a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h |
| +++ b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h |
| @@ -15,6 +15,10 @@ class ImageButton; |
| } |
| namespace ash { |
| +class LogoutButtonTray; |
| +} |
| + |
| +namespace ash { |
|
varkha
2016/07/14 21:34:47
Don't need it second time.
yiyix
2016/07/26 20:27:30
Done.
|
| // TODO(sky): make this visible on non-chromeos platforms. |
| class VirtualKeyboardTray : public TrayBackgroundView, |
| @@ -24,6 +28,12 @@ class VirtualKeyboardTray : public TrayBackgroundView, |
| explicit VirtualKeyboardTray(WmShelf* wm_shelf); |
| ~VirtualKeyboardTray() override; |
| + // Resets internal pointers. |
| + void Shutdown(); |
| + |
| + // Calls TrayBackgroundView::Initialize() and save a pointer to logout_button. |
|
varkha
2016/07/14 21:34:47
nit: How about
// Sets |logout_button_tray_| to |l
yiyix
2016/07/26 20:27:30
As we are using the new approach. we don't need to
|
| + void InitializeTrayItems(LogoutButtonTray* logout_button_tray); |
|
varkha
2016/07/14 21:34:47
Hmm. Not sure if you need this method. Maybe simpl
yiyix
2016/07/26 20:27:30
Per our discussion offline, I will use observer de
|
| + |
| // TrayBackgroundView: |
| void SetShelfAlignment(ShelfAlignment alignment) override; |
| base::string16 GetAccessibleNameForTray() override; |
| @@ -38,7 +48,11 @@ class VirtualKeyboardTray : public TrayBackgroundView, |
| void OnKeyboardEnabledStateChanged(bool new_value) override; |
| private: |
| + // views::View: |
| + void OnPaint(gfx::Canvas* canvas) override; |
| + |
| views::ImageButton* button_; // Not owned. |
| + LogoutButtonTray* logout_button_tray_; // Not owned. |
| DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); |
| }; |