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

Side by Side Diff: athena/wm/window_manager_impl.h

Issue 694883002: Do not allow split view to be engaged by a bezel gesture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « athena/wm/split_view_controller.cc ('k') | athena/wm/window_manager_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 5 #ifndef ATHENA_WM_WINDOW_MANAGER_IMPL_H_
6 #define ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 6 #define ATHENA_WM_WINDOW_MANAGER_IMPL_H_
7 7
8 #include "athena/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "athena/input/public/accelerator_manager.h" 9 #include "athena/input/public/accelerator_manager.h"
10 #include "athena/wm/public/window_list_provider_observer.h" 10 #include "athena/wm/public/window_list_provider_observer.h"
11 #include "athena/wm/public/window_manager.h" 11 #include "athena/wm/public/window_manager.h"
12 #include "athena/wm/title_drag_controller.h" 12 #include "athena/wm/title_drag_controller.h"
13 #include "athena/wm/window_overview_mode.h" 13 #include "athena/wm/window_overview_mode.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "ui/aura/window_observer.h" 16 #include "ui/aura/window_observer.h"
17 17
18 namespace wm { 18 namespace wm {
19 class ShadowController; 19 class ShadowController;
20 class WMState; 20 class WMState;
21 } 21 }
22 22
23 namespace athena { 23 namespace athena {
24 24
25 namespace test { 25 namespace test {
26 class WindowManagerImplTestApi; 26 class WindowManagerImplTestApi;
27 } 27 }
28 28
29 class BezelController;
30 class SplitViewController; 29 class SplitViewController;
31 class WindowListProviderImpl; 30 class WindowListProviderImpl;
32 class WindowManagerObserver; 31 class WindowManagerObserver;
33 32
34 class ATHENA_EXPORT WindowManagerImpl : public WindowManager, 33 class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
35 public WindowOverviewModeDelegate, 34 public WindowOverviewModeDelegate,
36 public WindowListProviderObserver, 35 public WindowListProviderObserver,
37 public aura::WindowObserver, 36 public aura::WindowObserver,
38 public AcceleratorHandler, 37 public AcceleratorHandler,
39 public TitleDragControllerDelegate { 38 public TitleDragControllerDelegate {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 98
100 // TitleDragControllerDelegate: 99 // TitleDragControllerDelegate:
101 aura::Window* GetWindowBehind(aura::Window* window) override; 100 aura::Window* GetWindowBehind(aura::Window* window) override;
102 void OnTitleDragStarted(aura::Window* window) override; 101 void OnTitleDragStarted(aura::Window* window) override;
103 void OnTitleDragCompleted(aura::Window* window) override; 102 void OnTitleDragCompleted(aura::Window* window) override;
104 void OnTitleDragCanceled(aura::Window* window) override; 103 void OnTitleDragCanceled(aura::Window* window) override;
105 104
106 scoped_ptr<aura::Window> container_; 105 scoped_ptr<aura::Window> container_;
107 scoped_ptr<WindowListProviderImpl> window_list_provider_; 106 scoped_ptr<WindowListProviderImpl> window_list_provider_;
108 scoped_ptr<WindowOverviewMode> overview_; 107 scoped_ptr<WindowOverviewMode> overview_;
109 scoped_ptr<BezelController> bezel_controller_;
110 scoped_ptr<SplitViewController> split_view_controller_; 108 scoped_ptr<SplitViewController> split_view_controller_;
111 scoped_ptr<wm::WMState> wm_state_; 109 scoped_ptr<wm::WMState> wm_state_;
112 scoped_ptr<TitleDragController> title_drag_controller_; 110 scoped_ptr<TitleDragController> title_drag_controller_;
113 scoped_ptr<wm::ShadowController> shadow_controller_; 111 scoped_ptr<wm::ShadowController> shadow_controller_;
114 ObserverList<WindowManagerObserver> observers_; 112 ObserverList<WindowManagerObserver> observers_;
115 113
116 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); 114 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
117 }; 115 };
118 116
119 } // namespace athena 117 } // namespace athena
120 118
121 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 119 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « athena/wm/split_view_controller.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698