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

Side by Side Diff: ash/wm/workspace/workspace_layout_manager.h

Issue 9566014: Attempt 2: Allows tab dragging when maximized on aura. To fix it I made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Created 8 years, 9 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
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_WORKSPACE_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
6 #define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ 6 #define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "ui/aura/layout_manager.h" 12 #include "ui/aura/layout_manager.h"
13 #include "ui/aura/window_observer.h"
13 14
14 namespace aura { 15 namespace aura {
15 class MouseEvent; 16 class MouseEvent;
16 class Window; 17 class Window;
17 } 18 }
18 19
19 namespace gfx { 20 namespace gfx {
20 class Rect; 21 class Rect;
21 } 22 }
22 23
23 namespace ash { 24 namespace ash {
24 namespace internal { 25 namespace internal {
25 26
26 class WorkspaceManager; 27 class WorkspaceManager;
27 28
28 // LayoutManager for top level windows when WorkspaceManager is enabled. 29 // LayoutManager for top level windows when WorkspaceManager is enabled.
29 class ASH_EXPORT WorkspaceLayoutManager : public aura::LayoutManager { 30 class ASH_EXPORT WorkspaceLayoutManager : public aura::LayoutManager,
31 public aura::WindowObserver {
30 public: 32 public:
31 explicit WorkspaceLayoutManager(WorkspaceManager* workspace_manager); 33 explicit WorkspaceLayoutManager(WorkspaceManager* workspace_manager);
32 virtual ~WorkspaceLayoutManager(); 34 virtual ~WorkspaceLayoutManager();
33 35
34 // Returns the workspace manager for this container. 36 // Returns the workspace manager for this container.
35 WorkspaceManager* workspace_manager() { 37 WorkspaceManager* workspace_manager() {
36 return workspace_manager_; 38 return workspace_manager_;
37 } 39 }
38 40
39 // Overridden from aura::LayoutManager: 41 // Overridden from aura::LayoutManager:
40 virtual void OnWindowResized() OVERRIDE; 42 virtual void OnWindowResized() OVERRIDE;
41 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; 43 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE;
42 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; 44 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE;
43 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 45 virtual void OnChildWindowVisibilityChanged(aura::Window* child,
44 bool visibile) OVERRIDE; 46 bool visibile) OVERRIDE;
45 virtual void SetChildBounds(aura::Window* child, 47 virtual void SetChildBounds(aura::Window* child,
46 const gfx::Rect& requested_bounds) OVERRIDE; 48 const gfx::Rect& requested_bounds) OVERRIDE;
47 49
50 // Overriden from aura::WindowObserver:
51 virtual void OnWindowPropertyChanged(aura::Window* window,
52 const void* key,
53 intptr_t old) OVERRIDE;
54
48 private: 55 private:
49 // Owned by WorkspaceController. 56 // Owned by WorkspaceController.
50 WorkspaceManager* workspace_manager_; 57 WorkspaceManager* workspace_manager_;
51 58
52 DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager); 59 DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
53 }; 60 };
54 61
55 } // namespace internal 62 } // namespace internal
56 } // namespace ash 63 } // namespace ash
57 64
58 #endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ 65 #endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_event_filter.cc ('k') | ash/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698