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

Unified Diff: chrome/browser/tab_contents/tab_contents_view_gtk.cc

Issue 159419: Correctly update drag status for drags over renderer. This makes things look ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: do what Brett says Created 11 years, 5 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/tab_contents/tab_contents_view_gtk.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents_view_gtk.cc (revision 21718)
+++ chrome/browser/tab_contents/tab_contents_view_gtk.cc (working copy)
@@ -8,11 +8,11 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "app/l10n_util.h"
#include "base/mime_util.h"
#include "base/gfx/point.h"
#include "base/gfx/rect.h"
#include "base/gfx/size.h"
+#include "base/pickle.h"
#include "base/string_util.h"
#include "build/build_config.h"
#include "chrome/browser/download/download_shelf.h"
@@ -34,8 +34,6 @@
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_source.h"
#include "chrome/common/notification_type.h"
-#include "grit/app_strings.h"
-#include "net/base/net_util.h"
#include "webkit/glue/webdropdata.h"
namespace {
@@ -231,7 +229,9 @@
// TODO(estade): we might want to support other actions besides copy,
// but that would increase the cost of getting our drag success guess
// wrong.
- gdk_drag_status(context_, GDK_ACTION_COPY, drag_over_time_);
+ gdk_drag_status(context_, is_drop_target ? GDK_ACTION_COPY :
+ static_cast<GdkDragAction>(0),
+ drag_over_time_);
is_drop_target_ = false;
}
}
@@ -820,20 +820,9 @@
}
case GtkDndUtil::CHROME_NAMED_URL: {
- std::string name;
- const GURL& url = view->drop_data_->url;
- if (!view->drop_data_->url_title.empty()) {
- name = UTF16ToUTF8(view->drop_data_->url_title);
- } else if (url.is_valid()) {
- name = WideToUTF8(net::GetSuggestedFilename(
- url, std::string(), std::string(), std::wstring()));
- } else {
- // Nothing else can be done, just use a default.
- name = l10n_util::GetStringUTF8(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME);
- }
Pickle pickle;
- pickle.WriteString(name);
- pickle.WriteString(url.spec());
+ pickle.WriteString(UTF16ToUTF8(view->drop_data_->url_title));
+ pickle.WriteString(view->drop_data_->url.spec());
gtk_selection_data_set(selection_data,
GtkDndUtil::GetAtomForTarget(GtkDndUtil::CHROME_NAMED_URL),
bits_per_byte,
« chrome/browser/gtk/bookmark_manager_gtk.cc ('K') | « chrome/browser/gtk/tabs/tab_strip_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698