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

Side by Side Diff: ash/aura/wm_shell_aura.cc

Issue 2642723007: chromeos: Removed enable magnifier from palette delegate. (Closed)
Patch Set: Trybot. Created 3 years, 11 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/aura/wm_shell_aura.h ('k') | ash/common/palette_delegate.h » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/aura/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/aura/key_event_watcher_aura.h" 9 #include "ash/aura/key_event_watcher_aura.h"
10 #include "ash/aura/pointer_watcher_adapter.h" 10 #include "ash/aura/pointer_watcher_adapter.h"
11 #include "ash/common/session/session_state_delegate.h" 11 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/shell_delegate.h" 12 #include "ash/common/shell_delegate.h"
13 #include "ash/common/shell_observer.h" 13 #include "ash/common/shell_observer.h"
14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
15 #include "ash/common/wm/mru_window_tracker.h" 15 #include "ash/common/wm/mru_window_tracker.h"
16 #include "ash/common/wm/overview/window_selector_controller.h" 16 #include "ash/common/wm/overview/window_selector_controller.h"
17 #include "ash/common/wm_activation_observer.h" 17 #include "ash/common/wm_activation_observer.h"
18 #include "ash/common/wm_display_observer.h" 18 #include "ash/common/wm_display_observer.h"
19 #include "ash/common/wm_window.h" 19 #include "ash/common/wm_window.h"
20 #include "ash/display/window_tree_host_manager.h" 20 #include "ash/display/window_tree_host_manager.h"
21 #include "ash/host/ash_window_tree_host_init_params.h" 21 #include "ash/host/ash_window_tree_host_init_params.h"
22 #include "ash/laser/laser_pointer_controller.h" 22 #include "ash/laser/laser_pointer_controller.h"
23 #include "ash/magnifier/partial_magnification_controller.h"
23 #include "ash/metrics/task_switch_metrics_recorder.h" 24 #include "ash/metrics/task_switch_metrics_recorder.h"
24 #include "ash/shared/immersive_fullscreen_controller.h" 25 #include "ash/shared/immersive_fullscreen_controller.h"
25 #include "ash/shell.h" 26 #include "ash/shell.h"
26 #include "ash/touch/touch_uma.h" 27 #include "ash/touch/touch_uma.h"
27 #include "ash/virtual_keyboard_controller.h" 28 #include "ash/virtual_keyboard_controller.h"
28 #include "ash/wm/drag_window_resizer.h" 29 #include "ash/wm/drag_window_resizer.h"
29 #include "ash/wm/lock_state_controller.h" 30 #include "ash/wm/lock_state_controller.h"
30 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" 31 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
31 #include "ash/wm/screen_pinning_controller.h" 32 #include "ash/wm/screen_pinning_controller.h"
32 #include "ash/wm/window_cycle_event_filter_aura.h" 33 #include "ash/wm/window_cycle_event_filter_aura.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 void WmShellAura::ToggleIgnoreExternalKeyboard() { 275 void WmShellAura::ToggleIgnoreExternalKeyboard() {
275 Shell::GetInstance() 276 Shell::GetInstance()
276 ->virtual_keyboard_controller() 277 ->virtual_keyboard_controller()
277 ->ToggleIgnoreExternalKeyboard(); 278 ->ToggleIgnoreExternalKeyboard();
278 } 279 }
279 280
280 void WmShellAura::SetLaserPointerEnabled(bool enabled) { 281 void WmShellAura::SetLaserPointerEnabled(bool enabled) {
281 Shell::GetInstance()->laser_pointer_controller()->SetEnabled(enabled); 282 Shell::GetInstance()->laser_pointer_controller()->SetEnabled(enabled);
282 } 283 }
283 284
285 void WmShellAura::SetPartialMagnifierEnabled(bool enabled) {
286 Shell::GetInstance()->partial_magnification_controller()->SetEnabled(enabled);
287 }
288
284 void WmShellAura::CreatePointerWatcherAdapter() { 289 void WmShellAura::CreatePointerWatcherAdapter() {
285 pointer_watcher_adapter_ = base::MakeUnique<PointerWatcherAdapter>(); 290 pointer_watcher_adapter_ = base::MakeUnique<PointerWatcherAdapter>();
286 } 291 }
287 292
288 void WmShellAura::CreatePrimaryHost() { 293 void WmShellAura::CreatePrimaryHost() {
289 Shell::GetInstance()->window_tree_host_manager()->Start(); 294 Shell::GetInstance()->window_tree_host_manager()->Start();
290 AshWindowTreeHostInitParams ash_init_params; 295 AshWindowTreeHostInitParams ash_init_params;
291 Shell::GetInstance()->window_tree_host_manager()->CreatePrimaryHost( 296 Shell::GetInstance()->window_tree_host_manager()->CreatePrimaryHost(
292 ash_init_params); 297 ash_init_params);
293 } 298 }
(...skipping 15 matching lines...) Expand all
309 for (auto& observer : display_observers_) 314 for (auto& observer : display_observers_)
310 observer.OnDisplayConfigurationChanging(); 315 observer.OnDisplayConfigurationChanging();
311 } 316 }
312 317
313 void WmShellAura::OnDisplayConfigurationChanged() { 318 void WmShellAura::OnDisplayConfigurationChanged() {
314 for (auto& observer : display_observers_) 319 for (auto& observer : display_observers_)
315 observer.OnDisplayConfigurationChanged(); 320 observer.OnDisplayConfigurationChanged();
316 } 321 }
317 322
318 } // namespace ash 323 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/palette_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698