From b020819fc1f4000f274c14e10121b90fb5c65c4d Mon Sep 17 00:00:00 2001 From: brave-builds Date: Fri, 31 May 2019 15:50:07 +0000 Subject: [PATCH] Uplift of #2558 (squashed) to dev --- ...-common-mac-app_mode_chrome_locator.mm.patch | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/patches/chrome-common-mac-app_mode_chrome_locator.mm.patch b/patches/chrome-common-mac-app_mode_chrome_locator.mm.patch index bcea763769e3..1001c1227ad5 100644 --- a/patches/chrome-common-mac-app_mode_chrome_locator.mm.patch +++ b/patches/chrome-common-mac-app_mode_chrome_locator.mm.patch @@ -1,13 +1,22 @@ diff --git a/chrome/common/mac/app_mode_chrome_locator.mm b/chrome/common/mac/app_mode_chrome_locator.mm -index efd272e706ba56b748e4b76b96d76cbd03aa07ac..b5d8d8cfa223d276db7a328036deeef658bc0320 100644 +index efd272e706ba56b748e4b76b96d76cbd03aa07ac..ead12da6a0fc7381d8e6e43ec5e68e40c0105683 100644 --- a/chrome/common/mac/app_mode_chrome_locator.mm +++ b/chrome/common/mac/app_mode_chrome_locator.mm -@@ -79,7 +79,7 @@ bool GetChromeBundleInfo(const base::FilePath& chrome_bundle, +@@ -79,9 +79,17 @@ bool GetChromeBundleInfo(const base::FilePath& chrome_bundle, // However, we want the shims to be agnostic to distribution and operate based // on the data in their plist, so encode the framework names here. NSDictionary* framework_for_exe = @{ -- @"Chromium": @"Chromium", -+ @"Brave": @"Brave", ++#if defined(BRAVE_CHROMIUM_BUILD) ++ @"Brave Browser": @"Brave Browser", ++ @"Brave Browser Beta": @"Brave Browser Beta", ++ @"Brave Browser Dev": @"Brave Browser Dev", ++ @"Brave Browser Nightly": @"Brave Browser Nightly", ++ @"Brave Browser Development": @"Brave Browser Development", ++#else + @"Chromium": @"Chromium", @"Google Chrome": @"Google Chrome", @"Google Chrome Canary": @"Google Chrome", ++#endif }; + NSString* framework_name = [framework_for_exe objectForKey:cr_bundle_exe]; + NSString* cr_framework_shlib_path =