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

Unified Diff: ash/wm_window.cc

Issue 2908793002: [mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace (Closed)
Patch Set: 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_window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm_window.cc
diff --git a/ash/wm_window.cc b/ash/wm_window.cc
index 59e7841036205fb8f7dbc088a6ef4b76fa7cad22..256a1ab55e97210fc8252259d5d11a053f09d82a 100644
--- a/ash/wm_window.cc
+++ b/ash/wm_window.cc
@@ -447,22 +447,6 @@ void WmWindow::Show() {
window_->Show();
}
-void WmWindow::CloseWidget() {
- if (Shell::GetAshConfig() == Config::MASH &&
- aura_window()->GetProperty(kWidgetCreationTypeKey) ==
- WidgetCreationType::FOR_CLIENT) {
- // NOTE: in the FOR_CLIENT case there is not necessarily a widget associated
- // with the window. Mash only creates widgets for top level windows if mash
- // renders the non-client frame.
- DCHECK(Shell::window_manager_client());
- Shell::window_manager_client()->RequestClose(aura_window());
- return;
- }
- views::Widget* widget = GetInternalWidgetForWindow(window_);
- DCHECK(widget);
- widget->Close();
-}
-
void WmWindow::SetFocused() {
aura::client::GetFocusClient(window_)->FocusWindow(window_);
}
@@ -565,18 +549,6 @@ void WmWindow::RemoveTransientWindowObserver(
}
}
-void WmWindow::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
- // In mus AddPreTargetHandler() only works for windows created by this client.
- DCHECK(Shell::GetAshConfig() != Config::MASH ||
- Shell::window_tree_client()->WasCreatedByThisClient(
- aura::WindowMus::Get(window_)));
- window_->AddPreTargetHandler(handler);
-}
-
-void WmWindow::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
- window_->RemovePreTargetHandler(handler);
-}
-
WmWindow::WmWindow(aura::Window* window) : window_(window) {
window_->SetProperty(kWmWindowKey, this);
}
« no previous file with comments | « ash/wm_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698