Index: resources/localized/English.lproj/Localizable.strings.in =================================================================== RCS file: /cvsroot/mozilla/camino/resources/localized/English.lproj/Localizable.strings.in,v retrieving revision 1.40 diff -u -8 -r1.40 Localizable.strings.in --- resources/localized/English.lproj/Localizable.strings.in 10 Aug 2009 18:08:38 -0000 1.40 +++ resources/localized/English.lproj/Localizable.strings.in 13 Aug 2009 15:18:43 -0000 @@ -534,10 +534,10 @@ /* To create paragraphs within the long description text, please wrap each paragraph in
tags. Because these strings appear in an XHTML page, each LongDescText string must begin with aand end with a
or the safe browsing page will not display. */ "PhishingLongDescText" = "Phishing sites are designed to trick you into revealing personal or financial information by creating copies of trusted websites.
Entering any information on this web page may result in identity theft or other fraud.
"; "MalwareLongDescText" = "Malware sites try to install programs that steal private information, use your computer to attack others, or damage your system.
Some malware sites intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.
Your computer can be infected just by proceeding to this site, without any further action on your part.
"; /* Really would like to pull the URL for MoreInformationText from browser.safebrowsing.warning.infoURL in all-camino.js */ "MoreInformationText" = "For more information about why this site was blocked, see Camino’s Safe Browsing Documentation."; -"GetMeOutButtonLabel" = "Get me out of here!"; +"GetMeOutButtonLabel" = "Close Page"; "IgnoreWarningButtonLabel" = "Ignore this warning"; Index: src/browser/BrowserWindowController.mm =================================================================== RCS file: /cvsroot/mozilla/camino/src/browser/BrowserWindowController.mm,v retrieving revision 1.409 diff -u -8 -r1.409 BrowserWindowController.mm --- src/browser/BrowserWindowController.mm 24 Jul 2009 23:50:14 -0000 1.409 +++ src/browser/BrowserWindowController.mm 13 Aug 2009 15:18:49 -0000 @@ -5269,24 +5269,16 @@ [mSearchBar setEditable:NO]; } else { [mURLBar setEditable:YES]; [mSearchBar setEditable:YES]; } } -- (void)runAwayFromSafeBrowsingBlockedSite -{ - if ([[mBrowserView browserView] canGoBack]) - [self back:self]; - else - [self home:self]; -} - - (void)showSafeBrowsingInformation { NSString *blockingInformationURL = [[PreferenceManager sharedInstance] getStringPref:kGeckoPrefSafeBrowsingInformationURL withSuccess:NULL]; [self loadURL:blockingInformationURL referrer:nil focusContent:YES allowPopups:NO]; } Index: src/browser/BrowserWrapper.h =================================================================== RCS file: /cvsroot/mozilla/camino/src/browser/BrowserWrapper.h,v retrieving revision 1.72 diff -u -8 -r1.72 BrowserWrapper.h --- src/browser/BrowserWrapper.h 24 Jul 2009 23:50:15 -0000 1.72 +++ src/browser/BrowserWrapper.h 13 Aug 2009 15:18:49 -0000 @@ -80,17 +80,16 @@ - (void)addCertificateOverrideForSite:(NSString*)url; - (BOOL)userChangedLocationField; - (void)contentViewChangedTo:(NSView*)inView forURL:(NSString*)inURL; // Called when the user clicks buttons on the about:safebrowsingblocked error page. -- (void)runAwayFromSafeBrowsingBlockedSite; - (void)showSafeBrowsingInformation; - (void)showMalwareDiagnosticInformation; - (void)reportIncorrectlyBlockedSite:(NSString*)aBlockedURL reason:(ESafeBrowsingBlockedReason)aBlockedReason; @end // // The BrowserWrapper requests UI to be created via this delegate. Unlike the Index: src/browser/BrowserWrapper.mm =================================================================== RCS file: /cvsroot/mozilla/camino/src/browser/BrowserWrapper.mm,v retrieving revision 1.167 diff -u -8 -r1.167 BrowserWrapper.mm --- src/browser/BrowserWrapper.mm 24 Jul 2009 23:50:15 -0000 1.167 +++ src/browser/BrowserWrapper.mm 13 Aug 2009 15:18:50 -0000 @@ -1011,17 +1011,17 @@ // if the command was sent from an error page overlay. - (void)performCommandForXULElementWithID:(NSString*)elementIdentifier onPage:(NSString*)pageURI { if ([elementIdentifier isEqualToString:@"exceptionDialogButton"]) { [mDelegate addCertificateOverrideForSite:[self currentURI]]; } else if ([pageURI hasPrefix:@"about:safebrowsingblocked"]) { if ([elementIdentifier isEqualToString:@"getMeOutButton"]) { - [mDelegate runAwayFromSafeBrowsingBlockedSite]; + [self runAwayFromBlockedSite:self]; } else if ([elementIdentifier isEqualToString:@"ignoreWarningButton"]) { [self loadURI:[self currentURI] referrer:nil flags:NSLoadFlagsBypassClassifier focusContent:YES allowPopups:NO]; } @@ -1727,20 +1727,20 @@ // IBAction from the safe browsing bar, sent from the "Report Incorrect Site" button. - (IBAction)reportIncorrectlyBlockedSite:(id)sender { NSString* blockedURL = [self currentURI]; ESafeBrowsingBlockedReason blockedReason = [self reasonForBlockingURL:blockedURL]; [mDelegate reportIncorrectlyBlockedSite:blockedURL reason:blockedReason]; } -// IBAction from the safe browsing bar, sent from the "Get me out of here" button. +// Sent when the user chooses to leave a dangerous page via the "Get Me Out" button. - (IBAction)runAwayFromBlockedSite:(id)sender { - [mDelegate runAwayFromSafeBrowsingBlockedSite]; + [self closeBrowserWindow]; } @end #pragma mark - // This value keeps the message text field from wrapping excessively. #define kMessageTextMinWidth 70