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

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

Issue 6462009: Allow dragging and dropping of URLs to any portion of the toolbar view.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc (revision 74816)
+++ chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc (working copy)
@@ -31,6 +31,7 @@
#include "net/base/escape.h"
#include "third_party/undoview/undo_view.h"
#include "ui/base/animation/multi_animation.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/color_utils.h"
@@ -44,6 +45,7 @@
#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "views/controls/textfield/native_textfield_views.h"
+#include "views/events/event.h"
#else
#include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h"
#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
@@ -65,6 +67,16 @@
return UTF16ToUTF8(text.substr(0, text_offset)).size();
}
+// A helper method for determining a valid drag operation given the allowed
+// operation. We prefer copy over link.
+int CopyOrLinkDragOperation(int drag_operation) {
+ if (drag_operation & ui::DragDropTypes::DRAG_COPY)
+ return ui::DragDropTypes::DRAG_COPY;
+ if (drag_operation & ui::DragDropTypes::DRAG_LINK)
+ return ui::DragDropTypes::DRAG_LINK;
+ return ui::DragDropTypes::DRAG_NONE;
+}
+
// Stores GTK+-specific state so it can be restored after switching tabs.
struct ViewState {
explicit ViewState(const AutocompleteEditViewGtk::CharRange& selection_range)
@@ -845,6 +857,27 @@
return host;
}
+int AutocompleteEditViewGtk::OnPerformDrop(
+ const views::DropTargetEvent& event) {
+ std::wstring text;
+ const ui::OSExchangeData& data = event.data();
+ if (data.HasURL()) {
+ GURL url;
+ std::wstring title;
+ if (data.GetURLAndTitle(&url, &title))
+ text = UTF8ToWide(url.spec());
+ } else {
+ std::wstring data_string;
+ if (data.GetString(&data_string))
+ text = CollapseWhitespace(data_string, true);
+ }
+
+ if (!text.empty() && OnPerformDropImpl(WideToUTF16(text)))
+ return CopyOrLinkDragOperation(event.source_operations());
+
+ return ui::DragDropTypes::DRAG_NONE;
+}
+
void AutocompleteEditViewGtk::EnableAccessibility() {
accessible_widget_helper_.reset(
new AccessibleWidgetHelper(text_view(), model_->profile()));
@@ -1548,8 +1581,7 @@
string16 possible_url = UTF8ToUTF16(reinterpret_cast<char*>(text));
g_free(text);
- if (model_->CanPasteAndGo(CollapseWhitespace(possible_url, true))) {
- model_->PasteAndGo();
+ if (OnPerformDropImpl(possible_url)) {
gtk_drag_finish(context, TRUE, TRUE, time);
static guint signal_id =
@@ -1740,6 +1772,15 @@
OwnPrimarySelection(UTF16ToUTF8(text));
}
+bool AutocompleteEditViewGtk::OnPerformDropImpl(const string16& text) {
+ if (model_->CanPasteAndGo(CollapseWhitespace(text, true))) {
+ model_->PasteAndGo();
+ return true;
+ }
+
+ return false;
+}
+
gfx::Font AutocompleteEditViewGtk::GetFont() {
#if defined(TOOLKIT_VIEWS)
bool use_gtk = false;
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_gtk.h ('k') | chrome/browser/autocomplete/autocomplete_edit_view_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698