Commit 24572e51 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Rename a function whose name conflicted in jumbo builds

In jumbo build experiments the presence of two different
OnCheckIsDefaultBrowserFinished functions meant that
Bind didn't know which one to bind and it didn't compile.

This patch renames one OnCheckIsDefaultBrowserFinished to
OpenURLAfterCheckIsDefaultBrowser which seems like a good
name for that function.

Bug: 803406
Change-Id: I056e613b7e3d55c0b2dbde68db8d75d3e2c55876
Reviewed-on: https://chromium-review.googlesource.com/998152Reviewed-by: default avatarBen Wells <benwells@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#548712}
parent dd626f58
...@@ -80,7 +80,7 @@ content::WebContents* OpenURLFromTabInternal( ...@@ -80,7 +80,7 @@ content::WebContents* OpenURLFromTabInternal(
return new_tab_params.target_contents; return new_tab_params.target_contents;
} }
void OnCheckIsDefaultBrowserFinished( void OpenURLAfterCheckIsDefaultBrowser(
std::unique_ptr<content::WebContents> source, std::unique_ptr<content::WebContents> source,
const content::OpenURLParams& params, const content::OpenURLParams& params,
shell_integration::DefaultWebClientState state) { shell_integration::DefaultWebClientState state) {
...@@ -142,7 +142,7 @@ ChromeAppDelegate::NewWindowContentsDelegate::OpenURLFromTab( ...@@ -142,7 +142,7 @@ ChromeAppDelegate::NewWindowContentsDelegate::OpenURLFromTab(
// WebContents by being assigned as its delegate within // WebContents by being assigned as its delegate within
// ChromeAppDelegate::AddNewContents(), but this is the first time // ChromeAppDelegate::AddNewContents(), but this is the first time
// NewWindowContentsDelegate actually sees the WebContents. Here ownership // NewWindowContentsDelegate actually sees the WebContents. Here ownership
// is captured and passed to OnCheckIsDefaultBrowserFinished(), which // is captured and passed to OpenURLAfterCheckIsDefaultBrowser(), which
// destroys it after the default browser worker completes. // destroys it after the default browser worker completes.
std::unique_ptr<content::WebContents> source_ptr(source); std::unique_ptr<content::WebContents> source_ptr(source);
// Object lifetime notes: StartCheckIsDefault() takes lifetime ownership of // Object lifetime notes: StartCheckIsDefault() takes lifetime ownership of
...@@ -151,7 +151,7 @@ ChromeAppDelegate::NewWindowContentsDelegate::OpenURLFromTab( ...@@ -151,7 +151,7 @@ ChromeAppDelegate::NewWindowContentsDelegate::OpenURLFromTab(
scoped_refptr<shell_integration::DefaultBrowserWorker> scoped_refptr<shell_integration::DefaultBrowserWorker>
check_if_default_browser_worker = check_if_default_browser_worker =
new shell_integration::DefaultBrowserWorker( new shell_integration::DefaultBrowserWorker(
base::Bind(&OnCheckIsDefaultBrowserFinished, base::Bind(&OpenURLAfterCheckIsDefaultBrowser,
base::Passed(&source_ptr), params)); base::Passed(&source_ptr), params));
check_if_default_browser_worker->StartCheckIsDefault(); check_if_default_browser_worker->StartCheckIsDefault();
} }
......
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