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

Side by Side Diff: ash/wm/workspace_controller.h

Issue 11417150: Implement workspace scrubbing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years 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 | « ash/wm/workspace/workspace_manager.cc ('k') | ash/wm/workspace_controller.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_WM_WORKSPACE_CONTROLLER_H_ 5 #ifndef ASH_WM_WORKSPACE_CONTROLLER_H_
6 #define ASH_WM_WORKSPACE_CONTROLLER_H_ 6 #define ASH_WM_WORKSPACE_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/wm/workspace/workspace_types.h" 9 #include "ash/wm/workspace/workspace_types.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/aura/client/activation_change_observer.h" 12 #include "ui/aura/client/activation_change_observer.h"
13 13
14 namespace aura { 14 namespace aura {
15 class Window; 15 class Window;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 namespace internal { 19 namespace internal {
20 20
21 class ShelfLayoutManager; 21 class ShelfLayoutManager;
22 class WorkspaceControllerTestHelper; 22 class WorkspaceControllerTestHelper;
23 class WorkspaceCycler;
23 class WorkspaceEventHandler; 24 class WorkspaceEventHandler;
24 class WorkspaceManager; 25 class WorkspaceManager;
25 26
26 // WorkspaceController acts as a central place that ties together all the 27 // WorkspaceController acts as a central place that ties together all the
27 // various workspace pieces. 28 // various workspace pieces.
28 class ASH_EXPORT WorkspaceController 29 class ASH_EXPORT WorkspaceController
29 : public aura::client::ActivationChangeObserver { 30 : public aura::client::ActivationChangeObserver {
30 public: 31 public:
31 explicit WorkspaceController(aura::Window* viewport); 32 explicit WorkspaceController(aura::Window* viewport);
32 virtual ~WorkspaceController(); 33 virtual ~WorkspaceController();
(...skipping 16 matching lines...) Expand all
49 virtual void OnWindowActivated(aura::Window* window, 50 virtual void OnWindowActivated(aura::Window* window,
50 aura::Window* old_active) OVERRIDE; 51 aura::Window* old_active) OVERRIDE;
51 52
52 private: 53 private:
53 friend class WorkspaceControllerTestHelper; 54 friend class WorkspaceControllerTestHelper;
54 55
55 aura::Window* viewport_; 56 aura::Window* viewport_;
56 57
57 scoped_ptr<WorkspaceManager> workspace_manager_; 58 scoped_ptr<WorkspaceManager> workspace_manager_;
58 59
60 // Cycles through the WorkspaceManager's workspaces in response to a three
61 // finger vertical scroll.
62 scoped_ptr<WorkspaceCycler> workspace_cycler_;
63
59 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); 64 DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
60 }; 65 };
61 66
62 } // namespace internal 67 } // namespace internal
63 } // namespace ash 68 } // namespace ash
64 69
65 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ 70 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_manager.cc ('k') | ash/wm/workspace_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698