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

Unified Diff: ash/common/shelf/shelf_tooltip_manager.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/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_tooltip_manager.cc
diff --git a/ash/common/shelf/shelf_tooltip_manager.cc b/ash/common/shelf/shelf_tooltip_manager.cc
index 130505d10b72d6da70b10d7e4f0d3569b39e3c95..5741bc2a0d68f70a7f38523c4ee4b40ffa2aa7c2 100644
--- a/ash/common/shelf/shelf_tooltip_manager.cc
+++ b/ash/common/shelf/shelf_tooltip_manager.cc
@@ -7,7 +7,6 @@
#include "ash/common/shelf/shelf_view.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
@@ -109,8 +108,7 @@ class ShelfTooltipManager::ShelfTooltipBubble
void OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
views::Widget* bubble_widget) const override {
// Place the bubble in the same display as the anchor.
- WmLookup::Get()
- ->GetWindowForWidget(anchor_widget())
+ WmWindow::Get(anchor_widget()->GetNativeWindow())
->GetRootWindowController()
->ConfigureWidgetInitParamsForContainer(
bubble_widget, kShellWindowId_SettingBubbleContainer, params);
@@ -136,14 +134,13 @@ ShelfTooltipManager::~ShelfTooltipManager() {
shelf_view_->wm_shelf()->RemoveObserver(this);
WmWindow* window = nullptr;
if (shelf_view_->GetWidget())
- window = WmLookup::Get()->GetWindowForWidget(shelf_view_->GetWidget());
+ window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
if (window)
window->RemoveLimitedPreTargetHandler(this);
}
void ShelfTooltipManager::Init() {
- WmWindow* window =
- WmLookup::Get()->GetWindowForWidget(shelf_view_->GetWidget());
+ WmWindow* window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
window->AddLimitedPreTargetHandler(this);
}
@@ -166,8 +163,7 @@ void ShelfTooltipManager::ShowTooltip(views::View* view) {
timer_.Stop();
if (bubble_) {
// Cancel the hiding animation to hide the old bubble immediately.
- WmLookup::Get()
- ->GetWindowForWidget(bubble_->GetWidget())
+ WmWindow::Get(bubble_->GetWidget()->GetNativeWindow())
->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
Close();
}
@@ -191,7 +187,7 @@ void ShelfTooltipManager::ShowTooltip(views::View* view) {
base::string16 text = shelf_view_->GetTitleForView(view);
bubble_ = new ShelfTooltipBubble(view, arrow, text);
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(bubble_->GetWidget());
+ WmWindow* window = WmWindow::Get(bubble_->GetWidget()->GetNativeWindow());
window->SetVisibilityAnimationType(
::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
window->SetVisibilityAnimationTransition(::wm::ANIMATE_HIDE);
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698