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

Side by Side Diff: ash/mus/bridge/shell_port_mash.cc

Issue 2906803002: Rename MaximizeMode to TabletMode (Closed)
Patch Set: updated filter Created 3 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
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/mus/bridge/shell_port_mash.h" 5 #include "ash/mus/bridge/shell_port_mash.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/accelerators/accelerator_controller.h" 9 #include "ash/accelerators/accelerator_controller.h"
10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
(...skipping 22 matching lines...) Expand all
33 #include "ash/shared/immersive_fullscreen_controller.h" 33 #include "ash/shared/immersive_fullscreen_controller.h"
34 #include "ash/shell.h" 34 #include "ash/shell.h"
35 #include "ash/shell_delegate.h" 35 #include "ash/shell_delegate.h"
36 #include "ash/shell_init_params.h" 36 #include "ash/shell_init_params.h"
37 #include "ash/shell_observer.h" 37 #include "ash/shell_observer.h"
38 #include "ash/system/tray/system_tray_delegate.h" 38 #include "ash/system/tray/system_tray_delegate.h"
39 #include "ash/touch/touch_uma.h" 39 #include "ash/touch/touch_uma.h"
40 #include "ash/virtual_keyboard_controller.h" 40 #include "ash/virtual_keyboard_controller.h"
41 #include "ash/wallpaper/wallpaper_delegate.h" 41 #include "ash/wallpaper/wallpaper_delegate.h"
42 #include "ash/wm/drag_window_resizer.h" 42 #include "ash/wm/drag_window_resizer.h"
43 #include "ash/wm/maximize_mode/maximize_mode_event_handler.h"
44 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
45 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
46 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone. h"
47 #include "ash/wm/mru_window_tracker.h" 43 #include "ash/wm/mru_window_tracker.h"
44 #include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h"
45 #include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
46 #include "ash/wm/tablet_mode/tablet_mode_event_handler.h"
47 #include "ash/wm/tablet_mode/tablet_mode_event_handler_aura.h"
48 #include "ash/wm/window_cycle_event_filter.h" 48 #include "ash/wm/window_cycle_event_filter.h"
49 #include "ash/wm/window_cycle_event_filter_aura.h" 49 #include "ash/wm/window_cycle_event_filter_aura.h"
50 #include "ash/wm/window_resizer.h" 50 #include "ash/wm/window_resizer.h"
51 #include "ash/wm/window_util.h" 51 #include "ash/wm/window_util.h"
52 #include "ash/wm/workspace/workspace_event_handler_aura.h" 52 #include "ash/wm/workspace/workspace_event_handler_aura.h"
53 #include "ash/wm_display_observer.h" 53 #include "ash/wm_display_observer.h"
54 #include "ash/wm_window.h" 54 #include "ash/wm_window.h"
55 #include "base/command_line.h" 55 #include "base/command_line.h"
56 #include "base/memory/ptr_util.h" 56 #include "base/memory/ptr_util.h"
57 #include "components/user_manager/user_info_impl.h" 57 #include "components/user_manager/user_info_impl.h"
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 361
362 std::unique_ptr<WindowCycleEventFilter> 362 std::unique_ptr<WindowCycleEventFilter>
363 ShellPortMash::CreateWindowCycleEventFilter() { 363 ShellPortMash::CreateWindowCycleEventFilter() {
364 if (GetAshConfig() == Config::MUS) 364 if (GetAshConfig() == Config::MUS)
365 return base::MakeUnique<WindowCycleEventFilterAura>(); 365 return base::MakeUnique<WindowCycleEventFilterAura>();
366 366
367 // TODO: implement me, http://crbug.com/629191. 367 // TODO: implement me, http://crbug.com/629191.
368 return nullptr; 368 return nullptr;
369 } 369 }
370 370
371 std::unique_ptr<wm::MaximizeModeEventHandler> 371 std::unique_ptr<wm::TabletModeEventHandler>
372 ShellPortMash::CreateMaximizeModeEventHandler() { 372 ShellPortMash::CreateTabletModeEventHandler() {
373 if (GetAshConfig() == Config::MUS) 373 if (GetAshConfig() == Config::MUS)
374 return base::MakeUnique<wm::MaximizeModeEventHandlerAura>(); 374 return base::MakeUnique<wm::TabletModeEventHandlerAura>();
375 375
376 // TODO: need support for window manager to get events before client: 376 // TODO: need support for window manager to get events before client:
377 // http://crbug.com/624157. 377 // http://crbug.com/624157.
378 NOTIMPLEMENTED(); 378 NOTIMPLEMENTED();
379 return nullptr; 379 return nullptr;
380 } 380 }
381 381
382 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 382 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
383 ShellPortMash::CreateScopedDisableInternalMouseAndKeyboard() { 383 ShellPortMash::CreateScopedDisableInternalMouseAndKeyboard() {
384 if (GetAshConfig() == Config::MUS) { 384 if (GetAshConfig() == Config::MUS) {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 observer.OnDisplayConfigurationChanging(); 635 observer.OnDisplayConfigurationChanging();
636 } 636 }
637 637
638 void ShellPortMash::OnDisplayConfigurationChanged() { 638 void ShellPortMash::OnDisplayConfigurationChanged() {
639 for (auto& observer : display_observers_) 639 for (auto& observer : display_observers_)
640 observer.OnDisplayConfigurationChanged(); 640 observer.OnDisplayConfigurationChanged();
641 } 641 }
642 642
643 } // namespace mus 643 } // namespace mus
644 } // namespace ash 644 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698