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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 2072853002: Implement "pinned" mode in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/shell.h ('k') | ash/wm/maximize_mode/maximize_mode_window_state.cc » ('j') | ash/wm/screen_pinning_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index e17a8da14ce76d2557525d600867b0b21d15779f..bab908fb24d109a717da11b4f31a2d057cb217f0 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -76,6 +76,7 @@
#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/power_button_controller.h"
#include "ash/wm/resize_shadow_controller.h"
+#include "ash/wm/screen_pinning_controller.h"
#include "ash/wm/system_gesture_event_filter.h"
#include "ash/wm/system_modal_container_event_filter.h"
#include "ash/wm/system_modal_container_layout_manager.h"
@@ -766,6 +767,8 @@ Shell::~Shell() {
power_button_controller_.reset();
lock_state_controller_.reset();
+ screen_pinning_controller_.reset();
+
#if defined(OS_CHROMEOS)
resolution_notification_controller_.reset();
#endif
@@ -991,6 +994,8 @@ void Shell::Init(const ShellInitParams& init_params) {
#if defined(OS_CHROMEOS)
sticky_keys_controller_.reset(new StickyKeysController);
#endif
+ screen_pinning_controller_.reset(new ScreenPinningController(
+ wm_shell_common_.get(), window_tree_host_manager_.get()));
lock_state_controller_.reset(new LockStateController);
power_button_controller_.reset(new PowerButtonController(
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/shell.h ('k') | ash/wm/maximize_mode/maximize_mode_window_state.cc » ('j') | ash/wm/screen_pinning_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698