Commit a281638a authored by sadrul@chromium.org's avatar sadrul@chromium.org

Do some null-checks to make sure removing an app on ash works correctly.

BUG=131282
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10831019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148477 0039d316-1c4b-4281-b951-d872f2087c98
parent 47b82e45
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment