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

Unified Diff: ash/system/tray/system_tray.cc

Issue 2888013002: chromeos: Remove some WmWindow usage from ash/system (Closed)
Patch Set: header 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
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 49c382b7d5d7ad11319dc3f92d62625e971aaad0..a6d65bc2bb915b552a9d8df9af72c7998a295cf5 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -50,7 +50,6 @@
#include "ash/system/web_notification/web_notification_tray.h"
#include "ash/wm/container_finder.h"
#include "ash/wm/widget_finder.h"
-#include "ash/wm_window.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
@@ -599,8 +598,7 @@ void SystemTray::OnBeforeBubbleWidgetInit(
views::Widget* bubble_widget,
views::Widget::InitParams* params) const {
// Place the bubble in the same root window as |anchor_widget|.
- WmWindow::Get(anchor_widget->GetNativeWindow())
- ->GetRootWindowController()
+ RootWindowController::ForWindow(anchor_widget->GetNativeWindow())
->ConfigureWidgetInitParamsForContainer(
bubble_widget, kShellWindowId_SettingBubbleContainer, params);
}

Powered by Google App Engine
This is Rietveld 408576698