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

Side by Side Diff: ash/shell.cc

Issue 2072853002: Implement "pinned" mode in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 unified diff | Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/wm/maximize_mode/maximize_mode_window_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "ash/wm/ash_native_cursor_manager.h" 69 #include "ash/wm/ash_native_cursor_manager.h"
70 #include "ash/wm/event_client_impl.h" 70 #include "ash/wm/event_client_impl.h"
71 #include "ash/wm/lock_state_controller.h" 71 #include "ash/wm/lock_state_controller.h"
72 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 72 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
73 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" 73 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
74 #include "ash/wm/overlay_event_filter.h" 74 #include "ash/wm/overlay_event_filter.h"
75 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" 75 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
76 #include "ash/wm/overview/window_selector_controller.h" 76 #include "ash/wm/overview/window_selector_controller.h"
77 #include "ash/wm/power_button_controller.h" 77 #include "ash/wm/power_button_controller.h"
78 #include "ash/wm/resize_shadow_controller.h" 78 #include "ash/wm/resize_shadow_controller.h"
79 #include "ash/wm/screen_pinning_controller.h"
79 #include "ash/wm/system_gesture_event_filter.h" 80 #include "ash/wm/system_gesture_event_filter.h"
80 #include "ash/wm/system_modal_container_event_filter.h" 81 #include "ash/wm/system_modal_container_event_filter.h"
81 #include "ash/wm/system_modal_container_layout_manager.h" 82 #include "ash/wm/system_modal_container_layout_manager.h"
82 #include "ash/wm/toplevel_window_event_handler.h" 83 #include "ash/wm/toplevel_window_event_handler.h"
83 #include "ash/wm/video_detector.h" 84 #include "ash/wm/video_detector.h"
84 #include "ash/wm/window_animations.h" 85 #include "ash/wm/window_animations.h"
85 #include "ash/wm/window_cycle_controller.h" 86 #include "ash/wm/window_cycle_controller.h"
86 #include "ash/wm/window_properties.h" 87 #include "ash/wm/window_properties.h"
87 #include "ash/wm/window_util.h" 88 #include "ash/wm/window_util.h"
88 #include "ash/wm/workspace_controller.h" 89 #include "ash/wm/workspace_controller.h"
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 toplevel_window_event_handler_.reset(); 760 toplevel_window_event_handler_.reset();
760 visibility_controller_.reset(); 761 visibility_controller_.reset();
761 // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be 762 // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be
762 // destroyed before |shelf_model_| is destroyed. 763 // destroyed before |shelf_model_| is destroyed.
763 shelf_item_delegate_manager_.reset(); 764 shelf_item_delegate_manager_.reset();
764 shelf_model_.reset(); 765 shelf_model_.reset();
765 766
766 power_button_controller_.reset(); 767 power_button_controller_.reset();
767 lock_state_controller_.reset(); 768 lock_state_controller_.reset();
768 769
770 screen_pinning_controller_.reset();
771
769 #if defined(OS_CHROMEOS) 772 #if defined(OS_CHROMEOS)
770 resolution_notification_controller_.reset(); 773 resolution_notification_controller_.reset();
771 #endif 774 #endif
772 desktop_background_controller_.reset(); 775 desktop_background_controller_.reset();
773 screenshot_controller_.reset(); 776 screenshot_controller_.reset();
774 mouse_cursor_filter_.reset(); 777 mouse_cursor_filter_.reset();
775 778
776 #if defined(OS_CHROMEOS) 779 #if defined(OS_CHROMEOS)
777 touch_transformer_controller_.reset(); 780 touch_transformer_controller_.reset();
778 #endif // defined(OS_CHROMEOS) 781 #endif // defined(OS_CHROMEOS)
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 987
985 system_gesture_filter_.reset(new SystemGestureEventFilter); 988 system_gesture_filter_.reset(new SystemGestureEventFilter);
986 AddPreTargetHandler(system_gesture_filter_.get()); 989 AddPreTargetHandler(system_gesture_filter_.get());
987 990
988 keyboard_metrics_filter_.reset(new KeyboardUMAEventFilter); 991 keyboard_metrics_filter_.reset(new KeyboardUMAEventFilter);
989 AddPreTargetHandler(keyboard_metrics_filter_.get()); 992 AddPreTargetHandler(keyboard_metrics_filter_.get());
990 993
991 #if defined(OS_CHROMEOS) 994 #if defined(OS_CHROMEOS)
992 sticky_keys_controller_.reset(new StickyKeysController); 995 sticky_keys_controller_.reset(new StickyKeysController);
993 #endif 996 #endif
997 screen_pinning_controller_.reset(new ScreenPinningController(
998 wm_shell_common_.get(), window_tree_host_manager_.get()));
994 999
995 lock_state_controller_.reset(new LockStateController); 1000 lock_state_controller_.reset(new LockStateController);
996 power_button_controller_.reset(new PowerButtonController( 1001 power_button_controller_.reset(new PowerButtonController(
997 lock_state_controller_.get())); 1002 lock_state_controller_.get()));
998 #if defined(OS_CHROMEOS) 1003 #if defined(OS_CHROMEOS)
999 // Pass the initial display state to PowerButtonController. 1004 // Pass the initial display state to PowerButtonController.
1000 power_button_controller_->OnDisplayModeChanged( 1005 power_button_controller_->OnDisplayModeChanged(
1001 display_configurator_->cached_displays()); 1006 display_configurator_->cached_displays());
1002 #endif 1007 #endif
1003 wm_shell_common_->AddShellObserver(lock_state_controller_.get()); 1008 wm_shell_common_->AddShellObserver(lock_state_controller_.get());
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 1223
1219 void Shell::OnWindowActivated( 1224 void Shell::OnWindowActivated(
1220 aura::client::ActivationChangeObserver::ActivationReason reason, 1225 aura::client::ActivationChangeObserver::ActivationReason reason,
1221 aura::Window* gained_active, 1226 aura::Window* gained_active,
1222 aura::Window* lost_active) { 1227 aura::Window* lost_active) {
1223 if (gained_active) 1228 if (gained_active)
1224 target_root_window_ = gained_active->GetRootWindow(); 1229 target_root_window_ = gained_active->GetRootWindow();
1225 } 1230 }
1226 1231
1227 } // namespace ash 1232 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/wm/maximize_mode/maximize_mode_window_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698