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

Unified Diff: chrome/browser/ui/cocoa/custom_frame_view.mm

Issue 157763002: [Mac] In +[CustomFrameView load], do not perform any work if the process has a --type flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/custom_frame_view.mm
diff --git a/chrome/browser/ui/cocoa/custom_frame_view.mm b/chrome/browser/ui/cocoa/custom_frame_view.mm
index 47b46ed2746f8a4b39c0ac2e310171adf3e94e63..a366f696c20a78f91d3b062649ddb0251877cc1f 100644
--- a/chrome/browser/ui/cocoa/custom_frame_view.mm
+++ b/chrome/browser/ui/cocoa/custom_frame_view.mm
@@ -4,6 +4,9 @@
#import "chrome/browser/ui/cocoa/custom_frame_view.h"
+#include <crt_externs.h>
+#include <string.h>
+
#import <objc/runtime.h>
Mark Mentovai 2014/02/07 18:49:39 Why are these in a separate section from the ones
Robert Sesek 2014/02/07 19:05:11 Done.
#import <Carbon/Carbon.h>
@@ -43,6 +46,18 @@ BOOL gCanGetCornerRadius = NO;
// roll overs for our close widgets, but things should still function
// correctly.
+ (void)load {
+ // Swizzling should only happen in the browser process. Running AppKit
+ // +initialize methods in the renderer may establish Mach IPC with
Mark Mentovai 2014/02/07 18:49:39 This comment should say the thing about +[NSThemeF
Robert Sesek 2014/02/07 19:05:11 Done.
+ // com.apple.windowserver.
+ // Note that CommandLine has not been initialized yet, since this is running
+ // as a module initializer.
+ const char* const* const argv = *_NSGetArgv();
+ for (int i = 0; i < *_NSGetArgc(); ++i) {
Mark Mentovai 2014/02/07 18:49:39 Don’t keep calling this and dereferencing it. int
Mark Mentovai 2014/02/07 18:49:39 argv[0] is the executable name. Command-line argum
Robert Sesek 2014/02/07 19:05:11 Done.
Robert Sesek 2014/02/07 19:05:11 Done.
+ const char* arg = argv[i];
+ if (strstr(arg, "--type=") != NULL)
Mark Mentovai 2014/02/07 18:49:39 Don’t scan the whole |arg|, --type= is only signif
Robert Sesek 2014/02/07 19:05:11 Done.
+ return;
+ }
+
base::mac::ScopedNSAutoreleasePool pool;
// On 10.8+ the background for textured windows are no longer drawn by
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698