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

Side by Side Diff: ui/aura/window.h

Issue 10836065: Improve WorkspaceWindowResizer::CompleteDrag() so that the function moves the window to a root windo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 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 | « ui/aura/client/screen_position_client.h ('k') | ui/aura/window.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 UI_AURA_WINDOW_H_ 5 #ifndef UI_AURA_WINDOW_H_
6 #define UI_AURA_WINDOW_H_ 6 #define UI_AURA_WINDOW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 10 matching lines...) Expand all
21 #include "ui/compositor/layer_animator.h" 21 #include "ui/compositor/layer_animator.h"
22 #include "ui/compositor/layer_delegate.h" 22 #include "ui/compositor/layer_delegate.h"
23 #include "ui/compositor/layer_owner.h" 23 #include "ui/compositor/layer_owner.h"
24 #include "ui/compositor/layer_type.h" 24 #include "ui/compositor/layer_type.h"
25 #include "ui/gfx/insets.h" 25 #include "ui/gfx/insets.h"
26 #include "ui/gfx/native_widget_types.h" 26 #include "ui/gfx/native_widget_types.h"
27 #include "ui/gfx/rect.h" 27 #include "ui/gfx/rect.h"
28 28
29 class SkCanvas; 29 class SkCanvas;
30 30
31 namespace gfx {
32 class Display;
33 }
34
31 namespace ui { 35 namespace ui {
32 class Layer; 36 class Layer;
33 class Texture; 37 class Texture;
34 class Transform; 38 class Transform;
35 } 39 }
36 40
37 namespace aura { 41 namespace aura {
38 42
39 class EventFilter; 43 class EventFilter;
40 class FocusManager; 44 class FocusManager;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // The Window takes ownership of the LayoutManager. 151 // The Window takes ownership of the LayoutManager.
148 void SetLayoutManager(LayoutManager* layout_manager); 152 void SetLayoutManager(LayoutManager* layout_manager);
149 LayoutManager* layout_manager() { return layout_manager_.get(); } 153 LayoutManager* layout_manager() { return layout_manager_.get(); }
150 154
151 // Changes the bounds of the window. If present, the window's parent's 155 // Changes the bounds of the window. If present, the window's parent's
152 // LayoutManager may adjust the bounds. 156 // LayoutManager may adjust the bounds.
153 void SetBounds(const gfx::Rect& new_bounds); 157 void SetBounds(const gfx::Rect& new_bounds);
154 158
155 // Changes the bounds of the window in the screen coordintates. 159 // Changes the bounds of the window in the screen coordintates.
156 // If present, the window's parent's LayoutManager may adjust the bounds. 160 // If present, the window's parent's LayoutManager may adjust the bounds.
157 void SetBoundsInScreen(const gfx::Rect& new_bounds_in_screen_coords); 161 void SetBoundsInScreen(const gfx::Rect& new_bounds_in_screen_coords,
162 const gfx::Display& dst_display);
158 163
159 // Returns the target bounds of the window. If the window's layer is 164 // Returns the target bounds of the window. If the window's layer is
160 // not animating, it simply returns the current bounds. 165 // not animating, it simply returns the current bounds.
161 gfx::Rect GetTargetBounds() const; 166 gfx::Rect GetTargetBounds() const;
162 167
163 // Marks the a portion of window as needing to be painted. 168 // Marks the a portion of window as needing to be painted.
164 void SchedulePaintInRect(const gfx::Rect& rect); 169 void SchedulePaintInRect(const gfx::Rect& rect);
165 170
166 // Assigns a new external texture to the window's layer. 171 // Assigns a new external texture to the window's layer.
167 void SetExternalTexture(ui::Texture* texture); 172 void SetExternalTexture(ui::Texture* texture);
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 }; 484 };
480 485
481 std::map<const void*, Value> prop_map_; 486 std::map<const void*, Value> prop_map_;
482 487
483 DISALLOW_COPY_AND_ASSIGN(Window); 488 DISALLOW_COPY_AND_ASSIGN(Window);
484 }; 489 };
485 490
486 } // namespace aura 491 } // namespace aura
487 492
488 #endif // UI_AURA_WINDOW_H_ 493 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/client/screen_position_client.h ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698