Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3896)

Unified Diff: ash/system/virtual_keyboard/virtual_keyboard_tray.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | ash/system/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/virtual_keyboard/virtual_keyboard_tray.h
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.h b/ash/system/virtual_keyboard/virtual_keyboard_tray.h
index 92c43775e02c703347cbdbac4fbc8c39e2a3fc13..c741a03945935223d5f16e05f76be41935dc8c3a 100644
--- a/ash/system/virtual_keyboard/virtual_keyboard_tray.h
+++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.h
@@ -21,7 +21,7 @@ class VirtualKeyboardTray : public TrayBackgroundView,
public KeyboardUIObserver,
public keyboard::KeyboardControllerObserver {
public:
- explicit VirtualKeyboardTray(WmShelf* wm_shelf);
+ explicit VirtualKeyboardTray(Shelf* shelf);
~VirtualKeyboardTray() override;
// TrayBackgroundView:
@@ -44,7 +44,7 @@ class VirtualKeyboardTray : public TrayBackgroundView,
// Weak pointer, will be parented by TrayContainer for its lifetime.
views::ImageView* icon_;
- WmShelf* wm_shelf_;
+ Shelf* shelf_;
DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray);
};
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | ash/system/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698