Index: content/browser/web_contents/web_contents_view_aura.cc |
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc |
index 8e4f4559e9426009ad02f8bf3eaa4a83db4d1434..7fe338c376d6299ce05e8c945362ca5a85b5ee56 100644 |
--- a/content/browser/web_contents/web_contents_view_aura.cc |
+++ b/content/browser/web_contents/web_contents_view_aura.cc |
@@ -158,19 +158,20 @@ class OverscrollWindowDelegate : public ImageWindowDelegate { |
// Listens to all mouse drag events during a drag and drop and sends them to |
// the renderer. |
-class WebDragSourceAura : public MessageLoopForUI::Observer, |
+class WebDragSourceAura : public base::MessageLoopForUI::Observer, |
public NotificationObserver { |
public: |
WebDragSourceAura(aura::Window* window, WebContentsImpl* contents) |
: window_(window), |
contents_(contents) { |
- MessageLoopForUI::current()->AddObserver(this); |
- registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_DISCONNECTED, |
+ base::MessageLoopForUI::current()->AddObserver(this); |
+ registrar_.Add(this, |
+ NOTIFICATION_WEB_CONTENTS_DISCONNECTED, |
Source<WebContents>(contents)); |
} |
virtual ~WebDragSourceAura() { |
- MessageLoopForUI::current()->RemoveObserver(this); |
+ base::MessageLoopForUI::current()->RemoveObserver(this); |
} |
// MessageLoop::Observer implementation: |
@@ -1114,11 +1115,15 @@ void WebContentsViewAura::StartDragging( |
int result_op = 0; |
{ |
gfx::NativeView content_native_view = GetContentNativeView(); |
- MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current()); |
- result_op = aura::client::GetDragDropClient(root_window)->StartDragAndDrop( |
- data, root_window, content_native_view, |
- event_info.event_location, ConvertFromWeb(operations), |
- event_info.event_source); |
+ base::MessageLoop::ScopedNestableTaskAllower allow( |
+ base::MessageLoop::current()); |
+ result_op = aura::client::GetDragDropClient(root_window) |
+ ->StartDragAndDrop(data, |
+ root_window, |
+ content_native_view, |
+ event_info.event_location, |
+ ConvertFromWeb(operations), |
+ event_info.event_source); |
} |
// Bail out immediately if the contents view window is gone. Note that it is |