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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 #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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 29 matching lines...) Expand all
40 #include "content/public/common/content_client.h" 40 #include "content/public/common/content_client.h"
41 #include "content/public/common/content_switches.h" 41 #include "content/public/common/content_switches.h"
42 #include "content/public/common/drop_data.h" 42 #include "content/public/common/drop_data.h"
43 #include "net/base/net_util.h" 43 #include "net/base/net_util.h"
44 #include "third_party/WebKit/public/web/WebInputEvent.h" 44 #include "third_party/WebKit/public/web/WebInputEvent.h"
45 #include "ui/aura/client/aura_constants.h" 45 #include "ui/aura/client/aura_constants.h"
46 #include "ui/aura/client/drag_drop_client.h" 46 #include "ui/aura/client/drag_drop_client.h"
47 #include "ui/aura/client/drag_drop_delegate.h" 47 #include "ui/aura/client/drag_drop_delegate.h"
48 #include "ui/aura/client/window_tree_client.h" 48 #include "ui/aura/client/window_tree_client.h"
49 #include "ui/aura/env.h" 49 #include "ui/aura/env.h"
50 #include "ui/aura/root_window.h"
51 #include "ui/aura/root_window_observer.h" 50 #include "ui/aura/root_window_observer.h"
52 #include "ui/aura/window.h" 51 #include "ui/aura/window.h"
52 #include "ui/aura/window_event_dispatcher.h"
53 #include "ui/aura/window_observer.h" 53 #include "ui/aura/window_observer.h"
54 #include "ui/base/clipboard/clipboard.h" 54 #include "ui/base/clipboard/clipboard.h"
55 #include "ui/base/clipboard/custom_data_helper.h" 55 #include "ui/base/clipboard/custom_data_helper.h"
56 #include "ui/base/dragdrop/drag_drop_types.h" 56 #include "ui/base/dragdrop/drag_drop_types.h"
57 #include "ui/base/dragdrop/drag_utils.h" 57 #include "ui/base/dragdrop/drag_utils.h"
58 #include "ui/base/dragdrop/drop_target_event.h" 58 #include "ui/base/dragdrop/drop_target_event.h"
59 #include "ui/base/dragdrop/os_exchange_data.h" 59 #include "ui/base/dragdrop/os_exchange_data.h"
60 #include "ui/base/hit_test.h" 60 #include "ui/base/hit_test.h"
61 #include "ui/compositor/layer.h" 61 #include "ui/compositor/layer.h"
62 #include "ui/compositor/scoped_layer_animation_settings.h" 62 #include "ui/compositor/scoped_layer_animation_settings.h"
(...skipping 1453 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 event.location(), 1516 event.location(),
1517 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 1517 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
1518 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 1518 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
1519 if (drag_dest_delegate_) 1519 if (drag_dest_delegate_)
1520 drag_dest_delegate_->OnDrop(); 1520 drag_dest_delegate_->OnDrop();
1521 current_drop_data_.reset(); 1521 current_drop_data_.reset();
1522 return ConvertFromWeb(current_drag_op_); 1522 return ConvertFromWeb(current_drag_op_);
1523 } 1523 }
1524 1524
1525 } // namespace content 1525 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698