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

Side by Side Diff: ash/shell.cc

Issue 2260613002: Adds ImmersiveContext and ImmersiveHandlerFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 4 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/immersive_context_ash.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 (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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "ash/magnifier/magnification_controller.h" 54 #include "ash/magnifier/magnification_controller.h"
55 #include "ash/magnifier/partial_magnification_controller.h" 55 #include "ash/magnifier/partial_magnification_controller.h"
56 #include "ash/root_window_controller.h" 56 #include "ash/root_window_controller.h"
57 #include "ash/shelf/shelf.h" 57 #include "ash/shelf/shelf.h"
58 #include "ash/shelf/shelf_widget.h" 58 #include "ash/shelf/shelf_widget.h"
59 #include "ash/shell_init_params.h" 59 #include "ash/shell_init_params.h"
60 #include "ash/utility/screenshot_controller.h" 60 #include "ash/utility/screenshot_controller.h"
61 #include "ash/wm/ash_focus_rules.h" 61 #include "ash/wm/ash_focus_rules.h"
62 #include "ash/wm/ash_native_cursor_manager.h" 62 #include "ash/wm/ash_native_cursor_manager.h"
63 #include "ash/wm/event_client_impl.h" 63 #include "ash/wm/event_client_impl.h"
64 #include "ash/wm/immersive_context_ash.h"
65 #include "ash/wm/immersive_handler_factory_ash.h"
64 #include "ash/wm/lock_state_controller.h" 66 #include "ash/wm/lock_state_controller.h"
65 #include "ash/wm/overlay_event_filter.h" 67 #include "ash/wm/overlay_event_filter.h"
66 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" 68 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
67 #include "ash/wm/power_button_controller.h" 69 #include "ash/wm/power_button_controller.h"
68 #include "ash/wm/resize_shadow_controller.h" 70 #include "ash/wm/resize_shadow_controller.h"
69 #include "ash/wm/screen_pinning_controller.h" 71 #include "ash/wm/screen_pinning_controller.h"
70 #include "ash/wm/system_gesture_event_filter.h" 72 #include "ash/wm/system_gesture_event_filter.h"
71 #include "ash/wm/system_modal_container_event_filter.h" 73 #include "ash/wm/system_modal_container_event_filter.h"
72 #include "ash/wm/system_modal_container_layout_manager.h" 74 #include "ash/wm/system_modal_container_layout_manager.h"
73 #include "ash/wm/toplevel_window_event_handler.h" 75 #include "ash/wm/toplevel_window_event_handler.h"
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 697
696 DCHECK(instance_ == this); 698 DCHECK(instance_ == this);
697 instance_ = nullptr; 699 instance_ = nullptr;
698 } 700 }
699 701
700 void Shell::Init(const ShellInitParams& init_params) { 702 void Shell::Init(const ShellInitParams& init_params) {
701 wm_shell_->Initialize(); 703 wm_shell_->Initialize();
702 704
703 in_mus_ = init_params.in_mus; 705 in_mus_ = init_params.in_mus;
704 706
707 immersive_context_ = base::MakeUnique<ImmersiveContextAsh>();
708 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
709
705 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 710 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
706 DCHECK(in_mus_) << "linux desktop does not support ash."; 711 DCHECK(in_mus_) << "linux desktop does not support ash.";
707 #endif 712 #endif
708 713
709 scoped_overview_animation_settings_factory_.reset( 714 scoped_overview_animation_settings_factory_.reset(
710 new ScopedOverviewAnimationSettingsFactoryAura); 715 new ScopedOverviewAnimationSettingsFactoryAura);
711 window_positioner_.reset(new WindowPositioner(wm_shell_.get())); 716 window_positioner_.reset(new WindowPositioner(wm_shell_.get()));
712 717
713 if (!in_mus_) { 718 if (!in_mus_) {
714 native_cursor_manager_ = new AshNativeCursorManager; 719 native_cursor_manager_ = new AshNativeCursorManager;
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 1044 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
1040 return std::unique_ptr<ui::EventTargetIterator>(); 1045 return std::unique_ptr<ui::EventTargetIterator>();
1041 } 1046 }
1042 1047
1043 ui::EventTargeter* Shell::GetEventTargeter() { 1048 ui::EventTargeter* Shell::GetEventTargeter() {
1044 NOTREACHED(); 1049 NOTREACHED();
1045 return nullptr; 1050 return nullptr;
1046 } 1051 }
1047 1052
1048 } // namespace ash 1053 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/wm/immersive_context_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698