Commit ea691753 authored by Yves Arrouye's avatar Yves Arrouye Committed by Commit Bot

Fix build for Google branded Chrome on Chrome OS

Order of definition matters.

TBR=ellyjones@chromium.org

Bug: N/A
Test: Build with target_os="chromeos" and is_chrome_branded=true in args.gn
Change-Id: I591ce1d8cd463e6a093b0dcdef1fc14963c6a42e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846465Reviewed-by: default avatarYves Arrouye <drcrash@chromium.org>
Commit-Queue: Yves Arrouye <drcrash@chromium.org>
Auto-Submit: Yves Arrouye <drcrash@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703907}
parent 06ee65c8
...@@ -95,11 +95,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) { ...@@ -95,11 +95,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
} }
#if defined(OS_CHROMEOS) && BUILDFLAG(GOOGLE_CHROME_BRANDING) #if defined(OS_CHROMEOS) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
void LaunchReleaseNotesInTab(Profile* profile) {
GURL url(BuildQueryString(profile));
auto displayer = std::make_unique<ScopedTabbedBrowserDisplayer>(profile);
ShowSingletonTab(displayer->browser(), url);
}
const std::string BuildQueryString(Profile* profile) { const std::string BuildQueryString(Profile* profile) {
const std::string board_name = base::SysInfo::GetLsbReleaseBoard(); const std::string board_name = base::SysInfo::GetLsbReleaseBoard();
...@@ -130,9 +125,13 @@ const std::string BuildQueryString(Profile* profile) { ...@@ -130,9 +125,13 @@ const std::string BuildQueryString(Profile* profile) {
",", region, ",", language, ",", channel_name, ",", user_type}); ",", region, ",", language, ",", channel_name, ",", user_type});
return query_string; return query_string;
} }
#endif
#if defined(OS_CHROMEOS) && BUILDFLAG(GOOGLE_CHROME_BRANDING) void LaunchReleaseNotesInTab(Profile* profile) {
GURL url(BuildQueryString(profile));
auto displayer = std::make_unique<ScopedTabbedBrowserDisplayer>(profile);
ShowSingletonTab(displayer->browser(), url);
}
void LaunchReleaseNotesImpl(Profile* profile) { void LaunchReleaseNotesImpl(Profile* profile) {
base::RecordAction(UserMetricsAction("ReleaseNotes.ShowReleaseNotes")); base::RecordAction(UserMetricsAction("ReleaseNotes.ShowReleaseNotes"));
const extensions::Extension* extension = const extensions::Extension* extension =
...@@ -150,6 +149,7 @@ void LaunchReleaseNotesImpl(Profile* profile) { ...@@ -150,6 +149,7 @@ void LaunchReleaseNotesImpl(Profile* profile) {
DVLOG(1) << "ReleaseNotes App Not Found"; DVLOG(1) << "ReleaseNotes App Not Found";
LaunchReleaseNotesInTab(profile); LaunchReleaseNotesInTab(profile);
} }
#endif #endif
// Shows either the help app or the appropriate help page for |source|. If // Shows either the help app or the appropriate help page for |source|. If
......
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