Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make shortcut work on MacOS (uplift to 0.67.x) #2567

Merged
merged 1 commit into from
Jun 3, 2019
Merged

Make shortcut work on MacOS (uplift to 0.67.x) #2567

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions patches/chrome-common-mac-app_mode_chrome_locator.mm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =