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

Unified Diff: ash/aura/wm_shell_aura.cc

Issue 2780943002: Enables ScreenPinningController for mash/mus (Closed)
Patch Set: local Created 3 years, 9 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/aura/wm_shell_aura.h ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 90e5bd4dd8ec1e1bd461f9a5e4b83ae0912f6415..60f0263827790778d82b1c6f95b8bd6c00cde002 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -31,7 +31,6 @@
#include "ash/virtual_keyboard_controller.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
-#include "ash/wm/screen_pinning_controller.h"
#include "ash/wm/window_cycle_event_filter_aura.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/workspace_event_handler_aura.h"
@@ -141,15 +140,6 @@ void WmShellAura::SetDisplayWorkAreaInsets(WmWindow* window,
->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets);
}
-bool WmShellAura::IsPinned() {
- return Shell::GetInstance()->screen_pinning_controller()->IsPinned();
-}
-
-void WmShellAura::SetPinnedWindow(WmWindow* window) {
- return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow(
- window);
-}
-
void WmShellAura::LockCursor() {
Shell::GetInstance()->cursor_manager()->LockCursor();
}
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698