Skip to content

Commit

Permalink
MiniBrowser should accept the '--url' command line argument
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=247451
rdar://101924215

Reviewed by Tim Horton.

Just like https://bugs.webkit.org/show_bug.cgi?id=247378 we want Mac MiniBrowser to accept
the --url command line argument.

And just like in the MobileMiniBrowser case, this patch will allow you to set a --url argument
in the Xcode scheme with something like --url https://www.apple.com

* Tools/MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate targetURLOrDefaultURL]):
(-[BrowserAppDelegate newWindow:]):

Canonical link: https://commits.webkit.org/256289@main
  • Loading branch information
rreno committed Nov 3, 2022
1 parent 0c5dc15 commit f5f63be
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion Tools/MiniBrowser/mac/AppDelegate.m
Expand Up @@ -40,6 +40,8 @@
#import <WebKit/_WKProcessPoolConfiguration.h>
#import <WebKit/_WKWebsiteDataStoreConfiguration.h>

static const NSString * const kURLArgumentString = @"--url";

enum {
WebKit1NewWindowTag = 1,
WebKit2NewWindowTag = 2,
Expand Down Expand Up @@ -190,14 +192,28 @@ - (BrowserWindowController *)createBrowserWindowController:(id)sender
return controller;
}

- (NSString *)targetURLOrDefaultURL
{
NSArray *args = [[NSProcessInfo processInfo] arguments];
const NSUInteger targetURLIndex = [args indexOfObject:kURLArgumentString];
NSString *targetURL = nil;

if (targetURLIndex != NSNotFound && targetURLIndex + 1 < [args count])
targetURL = [args objectAtIndex:targetURLIndex + 1];

if (!targetURL || [targetURL isEqualToString:@""])
return _settingsController.defaultURL;
return targetURL;
}

- (IBAction)newWindow:(id)sender
{
BrowserWindowController *controller = [self createBrowserWindowController:sender];
if (!controller)
return;

[[controller window] makeKeyAndOrderFront:sender];
[controller loadURLString:_settingsController.defaultURL];
[controller loadURLString:[self targetURLOrDefaultURL]];
}

- (IBAction)newPrivateWindow:(id)sender
Expand Down

0 comments on commit f5f63be

Please sign in to comment.