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

Side by Side Diff: chrome/browser/ui/gtk/download/download_item_gtk.cc

Issue 9815006: ui/gfx: Remove the deprecated "operator const GdkPixbuf*" from Image API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/download/download_item_gtk.h" 5 #include "chrome/browser/ui/gtk/download/download_item_gtk.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 626
627 void DownloadItemGtk::UpdateDangerIcon() { 627 void DownloadItemGtk::UpdateDangerIcon() {
628 if (theme_service_->UsingNativeTheme()) { 628 if (theme_service_->UsingNativeTheme()) {
629 const char* stock = download_model_->IsMalicious() ? 629 const char* stock = download_model_->IsMalicious() ?
630 GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING; 630 GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING;
631 gtk_image_set_from_stock( 631 gtk_image_set_from_stock(
632 GTK_IMAGE(dangerous_image_), stock, GTK_ICON_SIZE_SMALL_TOOLBAR); 632 GTK_IMAGE(dangerous_image_), stock, GTK_ICON_SIZE_SMALL_TOOLBAR);
633 } else { 633 } else {
634 // Set the warning icon. 634 // Set the warning icon.
635 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 635 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
636 int pixbuf_id = download_model_->IsMalicious() ? 636 int pixbuf_id = download_model_->IsMalicious() ? IDR_SAFEBROWSING_WARNING
637 IDR_SAFEBROWSING_WARNING : IDR_WARNING; 637 : IDR_WARNING;
638 GdkPixbuf* download_pixbuf = rb.GetNativeImageNamed(pixbuf_id); 638 gtk_image_set_from_pixbuf(GTK_IMAGE(dangerous_image_),
639 gtk_image_set_from_pixbuf(GTK_IMAGE(dangerous_image_), download_pixbuf); 639 rb.GetNativeImageNamed(pixbuf_id).ToGdkPixbuf());
640 } 640 }
641 } 641 }
642 642
643 // static 643 // static
644 void DownloadItemGtk::InitNineBoxes() { 644 void DownloadItemGtk::InitNineBoxes() {
645 if (body_nine_box_normal_) 645 if (body_nine_box_normal_)
646 return; 646 return;
647 647
648 body_nine_box_normal_ = new NineBox( 648 body_nine_box_normal_ = new NineBox(
649 IDR_DOWNLOAD_BUTTON_LEFT_TOP, 649 IDR_DOWNLOAD_BUTTON_LEFT_TOP,
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 get_download()->DangerousDownloadValidated(); 918 get_download()->DangerousDownloadValidated();
919 } 919 }
920 920
921 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) { 921 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
922 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", 922 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
923 base::Time::Now() - creation_time_); 923 base::Time::Now() - creation_time_);
924 if (get_download()->IsPartialDownload()) 924 if (get_download()->IsPartialDownload())
925 get_download()->Cancel(true); 925 get_download()->Cancel(true);
926 get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD); 926 get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
927 } 927 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/custom_drag.cc ('k') | chrome/browser/ui/gtk/download/download_shelf_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698