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

Side by Side Diff: ash/common/wm/immersive_context_ash.cc

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)
Patch Set: feedback and fix applist Created 3 years, 8 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/common/wm/immersive_context_ash.h" 5 #include "ash/common/wm/immersive_context_ash.h"
6 6
7 #include "ash/common/shelf/wm_shelf.h" 7 #include "ash/common/shelf/wm_shelf.h"
8 #include "ash/common/wm/window_state.h" 8 #include "ash/common/wm/window_state.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/common/wm_window.h" 10 #include "ash/common/wm_window.h"
11 #include "ash/shared/immersive_fullscreen_controller.h" 11 #include "ash/shared/immersive_fullscreen_controller.h"
12 #include "ash/wm/window_util.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "ui/display/display.h" 14 #include "ui/display/display.h"
14 #include "ui/display/screen.h" 15 #include "ui/display/screen.h"
15 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
16 17
17 namespace ash { 18 namespace ash {
18 19
19 ImmersiveContextAsh::ImmersiveContextAsh() {} 20 ImmersiveContextAsh::ImmersiveContextAsh() {}
20 21
21 ImmersiveContextAsh::~ImmersiveContextAsh() {} 22 ImmersiveContextAsh::~ImmersiveContextAsh() {}
(...skipping 27 matching lines...) Expand all
49 views::PointerWatcher* watcher, 50 views::PointerWatcher* watcher,
50 views::PointerWatcherEventTypes events) { 51 views::PointerWatcherEventTypes events) {
51 WmShell::Get()->AddPointerWatcher(watcher, events); 52 WmShell::Get()->AddPointerWatcher(watcher, events);
52 } 53 }
53 54
54 void ImmersiveContextAsh::RemovePointerWatcher(views::PointerWatcher* watcher) { 55 void ImmersiveContextAsh::RemovePointerWatcher(views::PointerWatcher* watcher) {
55 WmShell::Get()->RemovePointerWatcher(watcher); 56 WmShell::Get()->RemovePointerWatcher(watcher);
56 } 57 }
57 58
58 bool ImmersiveContextAsh::DoesAnyWindowHaveCapture() { 59 bool ImmersiveContextAsh::DoesAnyWindowHaveCapture() {
59 return WmShell::Get()->GetCaptureWindow() != nullptr; 60 return wm::GetCaptureWindow() != nullptr;
60 } 61 }
61 62
62 bool ImmersiveContextAsh::IsMouseEventsEnabled() { 63 bool ImmersiveContextAsh::IsMouseEventsEnabled() {
63 return WmShell::Get()->IsMouseEventsEnabled(); 64 return WmShell::Get()->IsMouseEventsEnabled();
64 } 65 }
65 66
66 } // namespace ash 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/fullscreen_window_finder.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698