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

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

Issue 488153003: Fix crash when dragging a half width window to split view from overivew mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « athena/wm/test/window_manager_impl_test_api.cc ('k') | athena/wm/window_manager_unittest.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/input/public/accelerator_manager.h" 8 #include "athena/input/public/accelerator_manager.h"
9 #include "athena/wm/public/window_manager.h" 9 #include "athena/wm/public/window_manager.h"
10 #include "athena/wm/title_drag_controller.h" 10 #include "athena/wm/title_drag_controller.h"
11 #include "athena/wm/window_overview_mode.h" 11 #include "athena/wm/window_overview_mode.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "ui/aura/window_observer.h" 14 #include "ui/aura/window_observer.h"
15 15
16 namespace wm { 16 namespace wm {
17 class ShadowController; 17 class ShadowController;
18 class WMState; 18 class WMState;
19 } 19 }
20 20
21 namespace athena { 21 namespace athena {
22 22
23 namespace test {
24 class WindowManagerImplTestApi;
25 }
26
23 class BezelController; 27 class BezelController;
24 class SplitViewController; 28 class SplitViewController;
25 class WindowListProvider; 29 class WindowListProvider;
26 class WindowManagerObserver; 30 class WindowManagerObserver;
27 31
28 class WindowManagerImpl : public WindowManager, 32 class WindowManagerImpl : public WindowManager,
29 public WindowOverviewModeDelegate, 33 public WindowOverviewModeDelegate,
30 public aura::WindowObserver, 34 public aura::WindowObserver,
31 public AcceleratorHandler, 35 public AcceleratorHandler,
32 public TitleDragControllerDelegate { 36 public TitleDragControllerDelegate {
33 public: 37 public:
34 WindowManagerImpl(); 38 WindowManagerImpl();
35 virtual ~WindowManagerImpl(); 39 virtual ~WindowManagerImpl();
36 40
37 // WindowManager: 41 // WindowManager:
38 virtual void ToggleOverview() OVERRIDE; 42 virtual void ToggleOverview() OVERRIDE;
39 virtual bool IsOverviewModeActive() OVERRIDE; 43 virtual bool IsOverviewModeActive() OVERRIDE;
40 44
41 private: 45 private:
42 friend class WindowManagerImplTestApi; 46 friend class test::WindowManagerImplTestApi;
43 friend class AthenaContainerLayoutManager; 47 friend class AthenaContainerLayoutManager;
44 48
45 enum Command { 49 enum Command {
46 CMD_TOGGLE_OVERVIEW, 50 CMD_TOGGLE_OVERVIEW,
47 CMD_TOGGLE_SPLIT_VIEW, 51 CMD_TOGGLE_SPLIT_VIEW,
48 }; 52 };
49 53
50 // Sets whether overview mode is active. 54 // Sets whether overview mode is active.
51 void SetInOverview(bool active); 55 void SetInOverview(bool active);
52 56
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 scoped_ptr<TitleDragController> title_drag_controller_; 91 scoped_ptr<TitleDragController> title_drag_controller_;
88 scoped_ptr<wm::ShadowController> shadow_controller_; 92 scoped_ptr<wm::ShadowController> shadow_controller_;
89 ObserverList<WindowManagerObserver> observers_; 93 ObserverList<WindowManagerObserver> observers_;
90 94
91 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); 95 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
92 }; 96 };
93 97
94 } // namespace athena 98 } // namespace athena
95 99
96 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_ 100 #endif // ATHENA_WM_WINDOW_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « athena/wm/test/window_manager_impl_test_api.cc ('k') | athena/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698