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

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

Issue 550043002: Keep the split view activities topmost in z-order in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 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/input/public/accelerator_manager.h" 9 #include "athena/input/public/accelerator_manager.h"
9 #include "athena/wm/public/window_manager.h" 10 #include "athena/wm/public/window_manager.h"
10 #include "athena/wm/title_drag_controller.h" 11 #include "athena/wm/title_drag_controller.h"
11 #include "athena/wm/window_overview_mode.h" 12 #include "athena/wm/window_overview_mode.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "base/observer_list.h" 14 #include "base/observer_list.h"
14 #include "ui/aura/window_observer.h" 15 #include "ui/aura/window_observer.h"
15 16
16 namespace wm { 17 namespace wm {
17 class ShadowController; 18 class ShadowController;
18 class WMState; 19 class WMState;
19 } 20 }
20 21
21 namespace athena { 22 namespace athena {
22 23
23 namespace test { 24 namespace test {
24 class WindowManagerImplTestApi; 25 class WindowManagerImplTestApi;
25 } 26 }
26 27
27 class BezelController; 28 class BezelController;
28 class SplitViewController; 29 class SplitViewController;
29 class WindowListProvider; 30 class WindowListProvider;
30 class WindowManagerObserver; 31 class WindowManagerObserver;
31 32
32 class WindowManagerImpl : public WindowManager, 33 class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
33 public WindowOverviewModeDelegate, 34 public WindowOverviewModeDelegate,
34 public aura::WindowObserver, 35 public aura::WindowObserver,
35 public AcceleratorHandler, 36 public AcceleratorHandler,
36 public TitleDragControllerDelegate { 37 public TitleDragControllerDelegate {
37 public: 38 public:
38 WindowManagerImpl(); 39 WindowManagerImpl();
39 virtual ~WindowManagerImpl(); 40 virtual ~WindowManagerImpl();
40 41
41 // WindowManager: 42 // WindowManager:
42 virtual void ToggleOverview() OVERRIDE; 43 virtual void ToggleOverview() OVERRIDE;
43 virtual bool IsOverviewModeActive() OVERRIDE; 44 virtual bool IsOverviewModeActive() OVERRIDE;
44 45
46 void ToggleSplitView();
47
45 private: 48 private:
46 friend class test::WindowManagerImplTestApi; 49 friend class test::WindowManagerImplTestApi;
47 friend class AthenaContainerLayoutManager; 50 friend class AthenaContainerLayoutManager;
48 51
49 enum Command { 52 enum Command {
50 CMD_TOGGLE_OVERVIEW, 53 CMD_TOGGLE_OVERVIEW,
51 CMD_TOGGLE_SPLIT_VIEW, 54 CMD_TOGGLE_SPLIT_VIEW,
52 }; 55 };
53 56
54 // Sets whether overview mode is active. 57 // Sets whether overview mode is active.
55 void SetInOverview(bool active); 58 void SetInOverview(bool active);
56 59
57 void ToggleSplitview();
58
59 void InstallAccelerators(); 60 void InstallAccelerators();
60 61
61 // WindowManager: 62 // WindowManager:
62 virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE; 63 virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE;
63 virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE; 64 virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE;
64 virtual void ToggleSplitViewForTest() OVERRIDE; 65 virtual void ToggleSplitViewForTest() OVERRIDE;
65 66
66 // WindowOverviewModeDelegate: 67 // WindowOverviewModeDelegate:
67 virtual void OnSelectWindow(aura::Window* window) OVERRIDE; 68 virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
68 virtual void OnSplitViewMode(aura::Window* left, 69 virtual void OnSplitViewMode(aura::Window* left,
(...skipping 23 matching lines...) Expand all
92 scoped_ptr<TitleDragController> title_drag_controller_; 93 scoped_ptr<TitleDragController> title_drag_controller_;
93 scoped_ptr<wm::ShadowController> shadow_controller_; 94 scoped_ptr<wm::ShadowController> shadow_controller_;
94 ObserverList<WindowManagerObserver> observers_; 95 ObserverList<WindowManagerObserver> observers_;
95 96
96 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); 97 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
97 }; 98 };
98 99
99 } // namespace athena 100 } // namespace athena
100 101
101 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 102 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698