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

Side by Side Diff: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

Issue 2309563002: Check if BubbleReference weak pointer is valid before using it in the chooser (Closed)
Patch Set: ran "git cl upload" twice, same as the previous patch. Created 4 years, 3 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
« no previous file with comments | « chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/views/website_settings/chooser_bubble_ui_view.h" 5 #include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 views::View* ChooserBubbleUiViewDelegate::CreateExtraView() { 122 views::View* ChooserBubbleUiViewDelegate::CreateExtraView() {
123 return chooser_content_view_->CreateExtraView(); 123 return chooser_content_view_->CreateExtraView();
124 } 124 }
125 125
126 views::View* ChooserBubbleUiViewDelegate::CreateFootnoteView() { 126 views::View* ChooserBubbleUiViewDelegate::CreateFootnoteView() {
127 return chooser_content_view_->CreateFootnoteView(); 127 return chooser_content_view_->CreateFootnoteView();
128 } 128 }
129 129
130 bool ChooserBubbleUiViewDelegate::Accept() { 130 bool ChooserBubbleUiViewDelegate::Accept() {
131 chooser_content_view_->Accept(); 131 chooser_content_view_->Accept();
132 bubble_reference_->CloseBubble(BUBBLE_CLOSE_ACCEPTED); 132 if (bubble_reference_)
133 bubble_reference_->CloseBubble(BUBBLE_CLOSE_ACCEPTED);
133 return true; 134 return true;
134 } 135 }
135 136
136 bool ChooserBubbleUiViewDelegate::Cancel() { 137 bool ChooserBubbleUiViewDelegate::Cancel() {
137 chooser_content_view_->Cancel(); 138 chooser_content_view_->Cancel();
138 bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED); 139 if (bubble_reference_)
140 bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED);
139 return true; 141 return true;
140 } 142 }
141 143
142 bool ChooserBubbleUiViewDelegate::Close() { 144 bool ChooserBubbleUiViewDelegate::Close() {
143 chooser_content_view_->Close(); 145 chooser_content_view_->Close();
144 return true; 146 return true;
145 } 147 }
146 148
147 views::View* ChooserBubbleUiViewDelegate::GetContentsView() { 149 views::View* ChooserBubbleUiViewDelegate::GetContentsView() {
148 return chooser_content_view_; 150 return chooser_content_view_;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 return browser_view->exclusive_access_bubble()->GetView(); 230 return browser_view->exclusive_access_bubble()->GetView();
229 231
230 return browser_view->top_container(); 232 return browser_view->top_container();
231 } 233 }
232 234
233 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() { 235 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
234 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) 236 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
235 return views::BubbleBorder::TOP_LEFT; 237 return views::BubbleBorder::TOP_LEFT;
236 return views::BubbleBorder::NONE; 238 return views::BubbleBorder::NONE;
237 } 239 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698