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

Side by Side Diff: ash/drag_drop/drag_drop_tracker.cc

Issue 472373006: Change type of drag-drop window to popup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comment 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 | « no previous file | no next file » | 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 #include "ash/drag_drop/drag_drop_tracker.h" 5 #include "ash/drag_drop/drag_drop_tracker.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/coordinate_conversion.h" 9 #include "ash/wm/coordinate_conversion.h"
10 #include "ui/aura/client/window_tree_client.h" 10 #include "ui/aura/client/window_tree_client.h"
(...skipping 24 matching lines...) Expand all
35 DISALLOW_COPY_AND_ASSIGN(CaptureWindowActivationDelegate); 35 DISALLOW_COPY_AND_ASSIGN(CaptureWindowActivationDelegate);
36 }; 36 };
37 37
38 // Creates a window for capturing drag events. 38 // Creates a window for capturing drag events.
39 aura::Window* CreateCaptureWindow(aura::Window* context_root, 39 aura::Window* CreateCaptureWindow(aura::Window* context_root,
40 aura::WindowDelegate* delegate) { 40 aura::WindowDelegate* delegate) {
41 static CaptureWindowActivationDelegate* activation_delegate_instance = NULL; 41 static CaptureWindowActivationDelegate* activation_delegate_instance = NULL;
42 if (!activation_delegate_instance) 42 if (!activation_delegate_instance)
43 activation_delegate_instance = new CaptureWindowActivationDelegate; 43 activation_delegate_instance = new CaptureWindowActivationDelegate;
44 aura::Window* window = new aura::Window(delegate); 44 aura::Window* window = new aura::Window(delegate);
45 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); 45 // Set type of window as popup to prevent different window manager codes
46 // trying to manage this window.
47 window->SetType(ui::wm::WINDOW_TYPE_POPUP);
46 window->Init(aura::WINDOW_LAYER_NOT_DRAWN); 48 window->Init(aura::WINDOW_LAYER_NOT_DRAWN);
47 aura::client::ParentWindowWithContext(window, context_root, gfx::Rect()); 49 aura::client::ParentWindowWithContext(window, context_root, gfx::Rect());
48 aura::client::SetActivationDelegate(window, activation_delegate_instance); 50 aura::client::SetActivationDelegate(window, activation_delegate_instance);
49 window->Show(); 51 window->Show();
50 DCHECK(window->bounds().size().IsEmpty()); 52 DCHECK(window->bounds().size().IsEmpty());
51 return window; 53 return window;
52 } 54 }
53 55
54 } // namespace 56 } // namespace
55 57
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 &target_root_location); 95 &target_root_location);
94 return new ui::MouseEvent(event.type(), 96 return new ui::MouseEvent(event.type(),
95 target_location, 97 target_location,
96 target_root_location, 98 target_root_location,
97 event.flags(), 99 event.flags(),
98 static_cast<const ui::MouseEvent&>(event). 100 static_cast<const ui::MouseEvent&>(event).
99 changed_button_flags()); 101 changed_button_flags());
100 } 102 }
101 103
102 } // namespace ash 104 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698