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

Unified Diff: ash/app_list/app_list_presenter_delegate.cc

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 10 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/BUILD.gn ('k') | ash/aura/wm_lookup_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/app_list/app_list_presenter_delegate.cc
diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc
index 41ee2d4392439e0a739b799b355cc886940f6971..fd568566aaa2d89b2a432d3da3066f3f1ec06196 100644
--- a/ash/app_list/app_list_presenter_delegate.cc
+++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -11,7 +11,6 @@
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm/wm_screen_util.h"
-#include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/window_tree_host_manager.h"
@@ -78,7 +77,7 @@ AppListPresenterDelegate::~AppListPresenterDelegate() {
if (keyboard_controller)
keyboard_controller->RemoveObserver(this);
Shell::GetInstance()->RemovePreTargetHandler(this);
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(view_->GetWidget());
+ WmWindow* window = WmWindow::Get(view_->GetWidget()->GetNativeWindow());
window->GetRootWindowController()->GetShelf()->RemoveObserver(this);
WmShell::Get()->RemoveShellObserver(this);
}
@@ -138,7 +137,7 @@ void AppListPresenterDelegate::OnDismissed() {
is_visible_ = false;
// Update applist button status when app list visibility is changed.
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(view_->GetWidget());
+ WmWindow* window = WmWindow::Get(view_->GetWidget()->GetNativeWindow());
AppListButton* app_list_button =
WmShelf::ForWindow(window)->shelf_widget()->GetAppListButton();
if (app_list_button)
@@ -151,7 +150,7 @@ void AppListPresenterDelegate::UpdateBounds() {
view_->UpdateBounds();
view_->SetAnchorPoint(GetCenterOfDisplayForWindow(
- WmLookup::Get()->GetWindowForWidget(view_->GetWidget()),
+ WmWindow::Get(view_->GetWidget()->GetNativeWindow()),
GetMinimumBoundsHeightForAppList(view_)));
}
« no previous file with comments | « ash/BUILD.gn ('k') | ash/aura/wm_lookup_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698