Update to Chromium revision 63396.

Fix crash in browser database system (issue #132).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@122 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2010-10-22 00:13:43 +00:00
parent cc6c213e53
commit d4004fc57e
8 changed files with 54 additions and 48 deletions

View File

@@ -1,5 +1,4 @@
// Copyright (c) 2008 The Chromium Embedded Framework Authors.
// Portions copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -8,34 +7,31 @@
#ifndef _BROWSER_DROP_DELEGATE_H
#define _BROWSER_DROP_DELEGATE_H
#include "base/base_drop_target.h"
#include "app/win/drop_target.h"
namespace WebKit {
class WebView;
}
class BrowserDropDelegate : public BaseDropTarget {
class BrowserDropDelegate : public app::win::DropTarget {
public:
BrowserDropDelegate(HWND source_hwnd, WebKit::WebView* webview)
: BaseDropTarget(source_hwnd),
webview_(webview) { }
BrowserDropDelegate(HWND source_hwnd, WebKit::WebView* webview);
protected:
// BaseDropTarget methods
virtual DWORD OnDragEnter(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect);
virtual DWORD OnDragOver(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect);
virtual void OnDragLeave(IDataObject* data_object);
virtual DWORD OnDrop(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect);
// BaseDropTarget methods
virtual DWORD OnDragEnter(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect);
virtual DWORD OnDragOver(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect);
virtual void OnDragLeave(IDataObject* data_object);
virtual DWORD OnDrop(IDataObject* data_object,
DWORD key_state,
POINT cursor_position,
DWORD effect);
private:
WebKit::WebView* webview_;