Index: ash/wm_window.cc |
diff --git a/ash/wm_window.cc b/ash/wm_window.cc |
index bce421a1d5496b0ff7c1d110c5e869f9c4498ada..f009c108cd653648a5ee7c8536ef02a154ad751d 100644 |
--- a/ash/wm_window.cc |
+++ b/ash/wm_window.cc |
@@ -6,11 +6,11 @@ |
#include "ash/ash_constants.h" |
#include "ash/aura/aura_layout_manager_adapter.h" |
-#include "ash/aura/wm_shell_aura.h" |
#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/public/cpp/window_properties.h" |
#include "ash/root_window_controller.h" |
#include "ash/shell.h" |
+#include "ash/shell_port.h" |
#include "ash/wm/resize_handle_window_targeter.h" |
#include "ash/wm/resize_shadow_controller.h" |
#include "ash/wm/widget_finder.h" |
@@ -155,10 +155,6 @@ RootWindowController* WmWindow::GetRootWindowController() { |
return root ? RootWindowController::ForWindow(root) : nullptr; |
} |
-WmShell* WmWindow::GetShell() const { |
- return WmShell::Get(); |
-} |
- |
void WmWindow::SetShellWindowId(int id) { |
window_->set_id(id); |
} |
@@ -580,7 +576,7 @@ void WmWindow::Show() { |
} |
void WmWindow::CloseWidget() { |
- if (WmShell::Get()->IsRunningInMash() && |
+ if (ShellPort::Get()->IsRunningInMash() && |
aura_window()->GetProperty(kWidgetCreationTypeKey) == |
WidgetCreationType::FOR_CLIENT) { |
// NOTE: in the FOR_CLIENT case there is not necessarily a widget associated |
@@ -643,7 +639,7 @@ WmWindow* WmWindow::GetChildByShellWindowId(int id) { |
} |
void WmWindow::ShowResizeShadow(int component) { |
- if (WmShell::Get()->IsRunningInMash()) { |
+ if (ShellPort::Get()->IsRunningInMash()) { |
// TODO: http://crbug.com/640773. |
return; |
} |
@@ -654,7 +650,7 @@ void WmWindow::ShowResizeShadow(int component) { |
} |
void WmWindow::HideResizeShadow() { |
- if (WmShell::Get()->IsRunningInMash()) { |
+ if (ShellPort::Get()->IsRunningInMash()) { |
// TODO: http://crbug.com/640773. |
return; |
} |
@@ -725,7 +721,7 @@ void WmWindow::RemoveTransientWindowObserver( |
void WmWindow::AddLimitedPreTargetHandler(ui::EventHandler* handler) { |
// In mus AddPreTargetHandler() only works for windows created by this client. |
- DCHECK(!WmShell::Get()->IsRunningInMash() || |
+ DCHECK(!ShellPort::Get()->IsRunningInMash() || |
Shell::window_tree_client()->WasCreatedByThisClient( |
aura::WindowMus::Get(window_))); |
window_->AddPreTargetHandler(handler); |