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

Unified Diff: ash/common/shelf/wm_shelf.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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/autoclick/autoclick_controller.cc ('k') | ash/common/wm_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/wm_shelf.cc
diff --git a/ash/common/shelf/wm_shelf.cc b/ash/common/shelf/wm_shelf.cc
index d42d4ad846f937690cbbfddf393be0c3776356a6..6f07f30e17683a611ffd173c6aed66bdc6200885 100644
--- a/ash/common/shelf/wm_shelf.cc
+++ b/ash/common/shelf/wm_shelf.cc
@@ -4,7 +4,6 @@
#include "ash/common/shelf/wm_shelf.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/shelf/shelf_controller.h"
#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/shelf/shelf_item_delegate.h"
@@ -45,11 +44,11 @@ class WmShelf::AutoHideEventHandler : public ui::EventHandler {
// Overridden from ui::EventHandler:
void OnMouseEvent(ui::MouseEvent* event) override {
shelf_layout_manager_->UpdateAutoHideForMouseEvent(
- event, WmWindowAura::Get(static_cast<aura::Window*>(event->target())));
+ event, WmWindow::Get(static_cast<aura::Window*>(event->target())));
}
void OnGestureEvent(ui::GestureEvent* event) override {
shelf_layout_manager_->UpdateAutoHideForGestureEvent(
- event, WmWindowAura::Get(static_cast<aura::Window*>(event->target())));
+ event, WmWindow::Get(static_cast<aura::Window*>(event->target())));
}
private:
« no previous file with comments | « ash/autoclick/autoclick_controller.cc ('k') | ash/common/wm_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698