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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 23503086: Move DropTargetEvent back to ui/base for the time being as it depends on OSExchangeData which I don… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows bustage Created 7 years, 2 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 | ui/base/dragdrop/drop_target_event.h » ('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 #include "content/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 30 matching lines...) Expand all
41 #include "ui/aura/client/drag_drop_client.h" 41 #include "ui/aura/client/drag_drop_client.h"
42 #include "ui/aura/client/drag_drop_delegate.h" 42 #include "ui/aura/client/drag_drop_delegate.h"
43 #include "ui/aura/root_window.h" 43 #include "ui/aura/root_window.h"
44 #include "ui/aura/root_window_observer.h" 44 #include "ui/aura/root_window_observer.h"
45 #include "ui/aura/window.h" 45 #include "ui/aura/window.h"
46 #include "ui/aura/window_observer.h" 46 #include "ui/aura/window_observer.h"
47 #include "ui/base/clipboard/clipboard.h" 47 #include "ui/base/clipboard/clipboard.h"
48 #include "ui/base/clipboard/custom_data_helper.h" 48 #include "ui/base/clipboard/custom_data_helper.h"
49 #include "ui/base/dragdrop/drag_drop_types.h" 49 #include "ui/base/dragdrop/drag_drop_types.h"
50 #include "ui/base/dragdrop/drag_utils.h" 50 #include "ui/base/dragdrop/drag_utils.h"
51 #include "ui/base/dragdrop/drop_target_event.h"
51 #include "ui/base/dragdrop/os_exchange_data.h" 52 #include "ui/base/dragdrop/os_exchange_data.h"
52 #include "ui/base/hit_test.h" 53 #include "ui/base/hit_test.h"
53 #include "ui/compositor/layer.h" 54 #include "ui/compositor/layer.h"
54 #include "ui/compositor/scoped_layer_animation_settings.h" 55 #include "ui/compositor/scoped_layer_animation_settings.h"
55 #include "ui/events/event.h" 56 #include "ui/events/event.h"
56 #include "ui/events/event_utils.h" 57 #include "ui/events/event_utils.h"
57 #include "ui/gfx/canvas.h" 58 #include "ui/gfx/canvas.h"
58 #include "ui/gfx/image/image.h" 59 #include "ui/gfx/image/image.h"
59 #include "ui/gfx/image/image_png_rep.h" 60 #include "ui/gfx/image/image_png_rep.h"
60 #include "ui/gfx/image/image_skia.h" 61 #include "ui/gfx/image/image_skia.h"
(...skipping 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1630 event.location(), 1631 event.location(),
1631 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 1632 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
1632 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 1633 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
1633 if (drag_dest_delegate_) 1634 if (drag_dest_delegate_)
1634 drag_dest_delegate_->OnDrop(); 1635 drag_dest_delegate_->OnDrop();
1635 current_drop_data_.reset(); 1636 current_drop_data_.reset();
1636 return current_drag_op_; 1637 return current_drag_op_;
1637 } 1638 }
1638 1639
1639 } // namespace content 1640 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | ui/base/dragdrop/drop_target_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698