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

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

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
Index: ash/system/virtual_keyboard/virtual_keyboard_tray.cc
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
index 7dd3599a8a399b39f0a1eb649963fbdd57eeb17d..ff6dfe85eff2a57164e18467bfd1e917dabe1495 100644
--- a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
+++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
@@ -8,8 +8,8 @@
#include "ash/keyboard/keyboard_ui.h"
#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/tray_constants.h"
@@ -25,10 +25,8 @@
namespace ash {
-VirtualKeyboardTray::VirtualKeyboardTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf),
- icon_(new views::ImageView),
- wm_shelf_(wm_shelf) {
+VirtualKeyboardTray::VirtualKeyboardTray(Shelf* shelf)
+ : TrayBackgroundView(shelf), icon_(new views::ImageView), shelf_(shelf) {
SetInkDropMode(InkDropMode::ON);
gfx::ImageSkia image =
@@ -67,7 +65,7 @@ void VirtualKeyboardTray::ClickedOutsideBubble() {}
bool VirtualKeyboardTray::PerformAction(const ui::Event& event) {
const int64_t display_id =
- wm_shelf_->GetWindow()->GetDisplayNearestWindow().id();
+ shelf_->GetWindow()->GetDisplayNearestWindow().id();
Shell::Get()->keyboard_ui()->ShowInDisplay(display_id);
// Normally, active status is set when virtual keyboard is shown/hidden,
// however, showing virtual keyboard happens asynchronously and, especially
« no previous file with comments | « ash/system/virtual_keyboard/virtual_keyboard_tray.h ('k') | ash/system/web_notification/ash_popup_alignment_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698