Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: chrome/browser/chrome_browser_application_mac.mm

Issue 1233983004: Remove base/mac/scoped_nsexception_enabler.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_browser_application_mac.mm
diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm
index 02479c015e5dfdb370534c34c5613b2dd5c99325..6d7c11c132b8d1bfc8711586561b0b893d7a3e9d 100644
--- a/chrome/browser/chrome_browser_application_mac.mm
+++ b/chrome/browser/chrome_browser_application_mac.mm
@@ -12,7 +12,6 @@
#include "base/debug/stack_trace.h"
#import "base/logging.h"
#include "base/mac/call_with_eh_frame.h"
-#import "base/mac/scoped_nsexception_enabler.h"
#import "base/mac/scoped_nsobject.h"
#import "base/mac/scoped_objc_class_swizzler.h"
#import "base/metrics/histogram.h"
@@ -320,23 +319,8 @@ void CancelTerminate() {
static_cast<long>(tag),
[actionString UTF8String],
aTarget);
-
base::debug::ScopedCrashKey key(crash_keys::mac::kSendAction, value);
- // Certain third-party code, such as print drivers, can still throw
- // exceptions and Chromium cannot fix them. This provides a way to
- // work around those on a spot basis.
- bool enableNSExceptions = false;
-
- // http://crbug.com/80686 , an Epson printer driver.
- if (anAction == @selector(selectPDE:)) {
- enableNSExceptions = true;
- }
-
- // Minimize the window by keeping this close to the super call.
- scoped_ptr<base::mac::ScopedNSExceptionEnabler> enabler;
- if (enableNSExceptions)
- enabler.reset(new base::mac::ScopedNSExceptionEnabler());
return [super sendAction:anAction to:aTarget from:sender];
}

Powered by Google App Engine
This is Rietveld 408576698