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

Unified Diff: ash/wm/overview/window_selector.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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/wm/overview/window_grid.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector.cc
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index 51cdfb9ee081d1aa5ff0c2b440d92598a34d45fb..50b9d60ff26b3a2c4e63e764e943b3ac3e950f80 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -131,7 +131,7 @@ class RoundedContainerView : public views::View {
// Triggers a shelf visibility update on all root window controllers.
void UpdateShelfVisibility() {
- for (WmWindow* root : ShellPort::Get()->GetAllRootWindows())
+ for (aura::Window* root : Shell::GetAllRootWindows())
WmShelf::ForWindow(root)->UpdateVisibilityState();
}
@@ -299,7 +299,7 @@ void WindowSelector::Init(const WindowList& windows) {
search_image_ = gfx::CreateVectorIcon(ui::kSearchIcon, kTextFilterIconSize,
kTextFilterIconColor);
- WmWindow* root_window = shell_port->GetPrimaryRootWindow();
+ WmWindow* root_window = WmWindow::Get(Shell::GetPrimaryRootWindow());
text_filter_widget_.reset(CreateTextFilter(this, root_window, search_image_,
&text_filter_bottom_));
}
@@ -637,7 +637,7 @@ void WindowSelector::PositionWindows(bool animate) {
}
void WindowSelector::RepositionTextFilterOnDisplayMetricsChange() {
- WmWindow* root_window = ShellPort::Get()->GetPrimaryRootWindow();
+ WmWindow* root_window = WmWindow::Get(Shell::GetPrimaryRootWindow());
const gfx::Rect rect = GetTextFilterPosition(root_window);
text_filter_bottom_ = rect.bottom() + kTextFieldBottomMargin;
text_filter_widget_->SetBounds(rect);
« no previous file with comments | « ash/wm/overview/window_grid.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698