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

Unified Diff: chrome/browser/ui/apps/chrome_app_delegate.cc

Issue 1657933003: Fixes the interactive default browser UX for policy setting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge issue Created 4 years, 10 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 | « chrome/browser/shell_integration.cc ('k') | chrome/browser/ui/startup/default_browser_prompt.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/apps/chrome_app_delegate.cc
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index 654c17b6f2302d13aea051fb3927ff6ab05977a9..8ed8e7f68876af90a12faf4a624659fe591ebf92 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -110,8 +110,6 @@ class OpenURLFromTabBasedOnBrowserDefault
}
}
- bool IsOwnedByWorker() override { return true; }
-
private:
scoped_ptr<content::WebContents> source_;
const content::OpenURLParams params_;
@@ -158,7 +156,8 @@ ChromeAppDelegate::NewWindowContentsDelegate::OpenURLFromTab(
check_if_default_browser_worker =
new shell_integration::DefaultBrowserWorker(
new OpenURLFromTabBasedOnBrowserDefault(std::move(owned_source),
- params));
+ params),
+ /*delete_observer=*/true);
// Object lifetime notes: The OpenURLFromTabBasedOnBrowserDefault is owned
// by check_if_default_browser_worker. StartCheckIsDefault() takes lifetime
// ownership of check_if_default_browser_worker and will clean up after
« no previous file with comments | « chrome/browser/shell_integration.cc ('k') | chrome/browser/ui/startup/default_browser_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698