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

Unified Diff: chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc

Issue 10831019: Do some null-checks to make sure removing an app on ash works correctly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
index e9adf67c2094d31163c891ab4cc3ab1a677ec792..2cc9676c0fa164daff6553985f6c60a727b53e84 100644
--- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -46,7 +46,7 @@ gfx::NativeWindow GetParent(Browser* browser) {
return app_list;
#endif
- if (browser->window())
+ if (browser && browser->window())
return browser->window()->GetNativeWindow();
return NULL;
@@ -131,7 +131,7 @@ ExtensionUninstallDialogViews::~ExtensionUninstallDialogViews() {
void ExtensionUninstallDialogViews::Show() {
gfx::NativeWindow parent = GetParent(browser_);
- if (!parent) {
+ if (browser_ && !parent) {
delegate_->ExtensionUninstallCanceled();
return;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698