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

Side by Side Diff: ash/wm/dock/docked_window_resizer.h

Issue 23645008: Use a weak pointer to determine if resizer was destroyed by nested Drag calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/wm/dock/docked_window_resizer.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_DOCK_DOCK_WINDOW_RESIZER_H_ 5 #ifndef ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
6 #define ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_ 6 #define ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
7 7
8 #include "ash/wm/dock/dock_types.h" 8 #include "ash/wm/dock/dock_types.h"
9 #include "ash/wm/window_resizer.h" 9 #include "ash/wm/window_resizer.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h"
12 13
13 namespace gfx { 14 namespace gfx {
14 class Point; 15 class Point;
15 class Rect; 16 class Rect;
16 } 17 }
17 18
18 namespace aura { 19 namespace aura {
19 class RootWindow; 20 class RootWindow;
20 } 21 }
21 22
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 92
92 // Gives a preview of where the the window will end up. 93 // Gives a preview of where the the window will end up.
93 scoped_ptr<PhantomWindowController> snap_phantom_window_controller_; 94 scoped_ptr<PhantomWindowController> snap_phantom_window_controller_;
94 95
95 // Set to true if the window that is being dragged was docked before drag. 96 // Set to true if the window that is being dragged was docked before drag.
96 bool was_docked_; 97 bool was_docked_;
97 98
98 // True if the dragged window is docked during the drag. 99 // True if the dragged window is docked during the drag.
99 bool is_docked_; 100 bool is_docked_;
100 101
101 // If non-NULL the destructor sets this to true. Used to determine if this has 102 base::WeakPtrFactory<DockedWindowResizer> weak_ptr_factory_;
102 // been deleted.
103 bool* destroyed_;
104 103
105 DISALLOW_COPY_AND_ASSIGN(DockedWindowResizer); 104 DISALLOW_COPY_AND_ASSIGN(DockedWindowResizer);
106 }; 105 };
107 106
108 } // namespace internal 107 } // namespace internal
109 } // namespace ash 108 } // namespace ash
110 109
111 #endif // ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_ 110 #endif // ASH_WM_DOCK_DOCK_WINDOW_RESIZER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698