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

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

Issue 635223004: Refactor SetInOverview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove bug fixes, leaving only refactor Created 6 years, 2 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/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_manager.h" 10 #include "athena/wm/public/window_manager.h"
(...skipping 24 matching lines...) Expand all
35 public aura::WindowObserver, 35 public aura::WindowObserver,
36 public AcceleratorHandler, 36 public AcceleratorHandler,
37 public TitleDragControllerDelegate { 37 public TitleDragControllerDelegate {
38 public: 38 public:
39 WindowManagerImpl(); 39 WindowManagerImpl();
40 virtual ~WindowManagerImpl(); 40 virtual ~WindowManagerImpl();
41 41
42 void ToggleSplitView(); 42 void ToggleSplitView();
43 43
44 // WindowManager: 44 // WindowManager:
45 virtual void ToggleOverview() override; 45 virtual void EnterOverview() override;
46 virtual void ExitOverview() override;
46 virtual bool IsOverviewModeActive() override; 47 virtual bool IsOverviewModeActive() override;
47 48
48 private: 49 private:
49 friend class test::WindowManagerImplTestApi; 50 friend class test::WindowManagerImplTestApi;
50 friend class AthenaContainerLayoutManager; 51 friend class AthenaContainerLayoutManager;
51 52
52 enum Command { 53 enum Command {
53 CMD_TOGGLE_OVERVIEW, 54 CMD_TOGGLE_OVERVIEW,
54 CMD_TOGGLE_SPLIT_VIEW, 55 CMD_TOGGLE_SPLIT_VIEW,
55 }; 56 };
56 57
57 // Sets whether overview mode is active. 58 void ExitOverviewNoActivate();
58 void SetInOverview(bool active);
59 59
60 void InstallAccelerators(); 60 void InstallAccelerators();
61 61
62 // WindowManager: 62 // WindowManager:
63 virtual void AddObserver(WindowManagerObserver* observer) override; 63 virtual void AddObserver(WindowManagerObserver* observer) override;
64 virtual void RemoveObserver(WindowManagerObserver* observer) override; 64 virtual void RemoveObserver(WindowManagerObserver* observer) override;
65 virtual void ToggleSplitViewForTest() override; 65 virtual void ToggleSplitViewForTest() override;
66 virtual WindowListProvider* GetWindowListProvider() override; 66 virtual WindowListProvider* GetWindowListProvider() override;
67 67
68 // WindowOverviewModeDelegate: 68 // WindowOverviewModeDelegate:
(...skipping 25 matching lines...) Expand all
94 scoped_ptr<TitleDragController> title_drag_controller_; 94 scoped_ptr<TitleDragController> title_drag_controller_;
95 scoped_ptr<wm::ShadowController> shadow_controller_; 95 scoped_ptr<wm::ShadowController> shadow_controller_;
96 ObserverList<WindowManagerObserver> observers_; 96 ObserverList<WindowManagerObserver> observers_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); 98 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
99 }; 99 };
100 100
101 } // namespace athena 101 } // namespace athena
102 102
103 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 103 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698