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

Unified Diff: ash/common/wm/panels/panel_layout_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/wm/panels/panel_frame_view.cc ('k') | ash/common/wm/panels/panel_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/panels/panel_layout_manager.cc
diff --git a/ash/common/wm/panels/panel_layout_manager.cc b/ash/common/wm/panels/panel_layout_manager.cc
index 964d946e49c53e1935f15e367b26ae6dcfb0f484..4ab475926fde2a653a87a9ce5858573191df33a1 100644
--- a/ash/common/wm/panels/panel_layout_manager.cc
+++ b/ash/common/wm/panels/panel_layout_manager.cc
@@ -14,7 +14,6 @@
#include "ash/common/wm/window_animation_types.h"
#include "ash/common/wm/window_parenting_utils.h"
#include "ash/common/wm/window_state.h"
-#include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/common/wm_window_property.h"
@@ -181,7 +180,7 @@ class PanelCalloutWidget : public views::Widget {
}
void SetAlignment(ShelfAlignment alignment) {
- WmWindow* window = WmLookup::Get()->GetWindowForWidget(this);
+ WmWindow* window = WmWindow::Get(this->GetNativeWindow());
gfx::Rect callout_bounds = window->GetBounds();
if (IsHorizontalAlignment(alignment)) {
callout_bounds.set_width(kArrowWidth);
@@ -217,7 +216,7 @@ class PanelCalloutWidget : public views::Widget {
this, parent->GetShellWindowId(), &params);
set_focus_on_creation(false);
Init(params);
- WmWindow* widget_window = WmLookup::Get()->GetWindowForWidget(this);
+ WmWindow* widget_window = WmWindow::Get(this->GetNativeWindow());
DCHECK_EQ(widget_window->GetRootWindow(), parent->GetRootWindow());
views::View* content_view = new views::View;
background_ = new CalloutWidgetBackground;
@@ -814,7 +813,7 @@ void PanelLayoutManager::UpdateCallouts() {
WmWindow* panel = iter->window;
views::Widget* callout_widget = iter->callout_widget;
WmWindow* callout_widget_window =
- WmLookup::Get()->GetWindowForWidget(callout_widget);
+ WmWindow::Get(callout_widget->GetNativeWindow());
gfx::Rect current_bounds = panel->GetBoundsInScreen();
gfx::Rect bounds =
« no previous file with comments | « ash/common/wm/panels/panel_frame_view.cc ('k') | ash/common/wm/panels/panel_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698