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

Unified Diff: chrome/browser/ui/gtk/global_error_bubble.cc

Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/ui/gtk/global_error_bubble.cc
diff --git a/chrome/browser/ui/gtk/global_error_bubble.cc b/chrome/browser/ui/gtk/global_error_bubble.cc
index e26c3d3d402be6b7497f6f065c29d79b45bfd081..d5203a75e59bc7eb3827c1face625ab99b9870d4 100644
--- a/chrome/browser/ui/gtk/global_error_bubble.cc
+++ b/chrome/browser/ui/gtk/global_error_bubble.cc
@@ -38,7 +38,7 @@ GlobalErrorBubble::GlobalErrorBubble(Browser* browser,
error_(error),
message_width_(kMinMessageLabelWidth) {
DCHECK(browser_);
- DCHECK(error_);
+ DCHECK(error_.get());
GtkWidget* content = gtk_vbox_new(FALSE, ui::kControlSpacing);
gtk_container_set_border_width(GTK_CONTAINER(content),
ui::kContentAreaBorder);
@@ -122,7 +122,7 @@ GlobalErrorBubble::~GlobalErrorBubble() {
void GlobalErrorBubble::BubbleClosing(BubbleGtk* bubble,
bool closed_by_escape) {
- if (error_)
+ if (error_.get())
error_->BubbleViewDidClose(browser_);
}
@@ -131,13 +131,13 @@ void GlobalErrorBubble::OnDestroy(GtkWidget* sender) {
}
void GlobalErrorBubble::OnAcceptButton(GtkWidget* sender) {
- if (error_)
+ if (error_.get())
error_->BubbleViewAcceptButtonPressed(browser_);
bubble_->Close();
}
void GlobalErrorBubble::OnCancelButton(GtkWidget* sender) {
- if (error_)
+ if (error_.get())
error_->BubbleViewCancelButtonPressed(browser_);
bubble_->Close();
}
« no previous file with comments | « chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698