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

Unified Diff: chrome/browser/download/download_util.cc

Issue 9969080: Remove TOOLKIT_USES_GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add gtk dependency to android linux host Created 8 years, 9 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/defaults.cc ('k') | chrome/browser/extensions/extension_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_util.cc
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 5bfa4e2ec116dc9aefaae3a2d597c465b705b68e..6dda2c22d6d2970287026660cbe4ddae8508970f 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -55,22 +55,15 @@
#if defined(TOOLKIT_VIEWS)
#include "ui/base/dragdrop/drag_utils.h"
#include "ui/base/dragdrop/os_exchange_data.h"
-#if !defined(TOOLKIT_USES_GTK)
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/gfx/screen.h"
#include "ui/views/widget/widget.h"
#endif
-#endif
-#if defined(TOOLKIT_USES_GTK)
-#if defined(TOOLKIT_VIEWS)
-#include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/views/widget/native_widget_gtk.h"
-#elif defined(TOOLKIT_GTK)
+#if defined(TOOLKIT_GTK)
#include "chrome/browser/ui/gtk/custom_drag.h"
#include "chrome/browser/ui/gtk/unity_service.h"
#endif // defined(TOOLKIT_GTK)
-#endif // defined(TOOLKIT_USES_GTK)
#if defined(OS_WIN) && !defined(USE_AURA)
#include "base/win/scoped_comptr.h"
@@ -396,7 +389,7 @@ void DragDownload(const DownloadItem* download,
download->GetFileNameToReportUser().LossyDisplayName());
}
-#if !defined(TOOLKIT_USES_GTK)
+#if !defined(TOOLKIT_GTK)
views::Widget* widget = views::Widget::GetWidgetForNativeView(view);
// TODO(varunjain): Widget should not be NULL here. But its causing the crash
// in http://code.google.com/p/chromium/issues/detail?id=120430 Find out why.
@@ -421,7 +414,7 @@ void DragDownload(const DownloadItem* download,
widget->DoDrag(data,
ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK);
-#endif // TOOLKIT_USES_GTK
+#endif // TOOLKIT_GTK
}
#elif defined(USE_X11)
void DragDownload(const DownloadItem* download,
« no previous file with comments | « chrome/browser/defaults.cc ('k') | chrome/browser/extensions/extension_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698