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

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

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Remove wm_lookup. 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
Index: ash/common/shelf/shelf_view.cc
diff --git a/ash/common/shelf/shelf_view.cc b/ash/common/shelf/shelf_view.cc
index 8037b536c9ed6368ad5fbfa090dfd7704e0bba49..ef7abf7663889a47c3c2fcbfa0776d402afe7467 100644
--- a/ash/common/shelf/shelf_view.cc
+++ b/ash/common/shelf/shelf_view.cc
@@ -24,7 +24,6 @@
#include "ash/common/shell_delegate.h"
#include "ash/common/strings/grit/ash_strings.h"
#include "ash/common/wm/root_window_finder.h"
-#include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "base/auto_reset.h"
@@ -450,7 +449,7 @@ void ShelfView::ButtonPressed(views::Button* sender,
DCHECK_LT(-1, last_pressed_index_);
// Place new windows on the same display as the button.
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(sender->GetWidget());
+ WmWindow* window = WmWindow::Get(sender->GetWidget()->GetNativeWindow());
scoped_root_window_for_new_windows_.reset(
new ScopedRootWindowForNewWindows(window->GetRootWindow()));
@@ -529,8 +528,7 @@ void ShelfView::CreateDragIconProxy(
float scale_factor) {
drag_replaced_view_ = replaced_view;
WmWindow* root_window =
- WmLookup::Get()
- ->GetWindowForWidget(drag_replaced_view_->GetWidget())
+ WmWindow::Get(drag_replaced_view_->GetWidget()->GetNativeWindow())
->GetRootWindow();
drag_image_.reset(new DragImageView(
root_window, ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE));
@@ -1082,8 +1080,7 @@ bool ShelfView::HandleRipOffDrag(const ui::LocatedEvent& event) {
delegate_->GetAppIDForShelfID(model_->items()[current_index].id);
gfx::Point screen_location =
- WmLookup::Get()
- ->GetWindowForWidget(GetWidget())
+ WmWindow::Get(GetWidget()->GetNativeWindow())
->GetRootWindow()
->ConvertPointToScreen(event.root_location());
@@ -1673,7 +1670,7 @@ void ShelfView::ShowMenu(std::unique_ptr<ui::MenuModel> menu_model,
new views::MenuRunner(menu_model_adapter_->CreateMenu(), run_types));
// Place new windows on the same display as the button that spawned the menu.
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(source->GetWidget());
+ WmWindow* window = WmWindow::Get(source->GetWidget()->GetNativeWindow());
scoped_root_window_for_new_windows_.reset(
new ScopedRootWindowForNewWindows(window->GetRootWindow()));

Powered by Google App Engine
This is Rietveld 408576698