chrome/browser/ui/webui/extensions/install_extension_handler.cc - Issue 18281002: Move WebDropData to content::DropData and split off conversion function.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/extensions/install_extension_handler.cc

Issue 18281002: Move WebDropData to content::DropData and split off conversion function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Mac build error. Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc ('k') | content/browser/browser_plugin/browser_plugin_guest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/extensions/install_extension_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.cc b/chrome/browser/ui/webui/extensions/install_extension_handler.cc

index cb640b917402f72d76e17fd80a26767cba13e1bc..6ccf455336e55d91bf87b7521de86cdb94e855a9 100644

--- a/chrome/browser/ui/webui/extensions/install_extension_handler.cc

+++ b/chrome/browser/ui/webui/extensions/install_extension_handler.cc

@@ -17,10 +17,10 @@

#include "content/public/browser/web_contents_view.h"

#include "content/public/browser/web_ui.h"

#include "content/public/browser/web_ui_data_source.h"

+#include "content/public/common/drop_data.h"

#include "grit/generated_resources.h"

#include "net/base/net_util.h"

#include "ui/base/l10n/l10n_util.h"

-#include "webkit/common/webdropdata.h"

InstallExtensionHandler::InstallExtensionHandler() {

}

@@ -54,7 +54,8 @@ void InstallExtensionHandler::RegisterMessages() {

}

void InstallExtensionHandler::HandleStartDragMessage(const ListValue* args) {

- WebDropData* drop_data = web_ui()->GetWebContents()->GetView()->GetDropData();

+ content::DropData* drop_data =

+ web_ui()->GetWebContents()->GetView()->GetDropData();

if (!drop_data) {

DLOG(ERROR) << "No current drop data.";

return;

@@ -65,7 +66,7 @@ void InstallExtensionHandler::HandleStartDragMessage(const ListValue* args) {

return;

}

- const WebDropData::FileInfo& file_info = drop_data->filenames.front();

+ const content::DropData::FileInfo& file_info = drop_data->filenames.front();

file_to_install_ = base::FilePath::FromWStringHack(

UTF16ToWide(file_info.path));