Issue 385009: [Mac] ScopedSendingEvent finds NSApp by itself.

Issue 385009: [Mac] ScopedSendingEvent finds NSApp by itself. (Closed)

Created:
11 years, 1 month ago by Scott Hess - ex-Googler

Modified:
9 years, 6 months ago

Reviewers:
Mark Mentovai, dmac

CC:
chromium-reviews_googlegroups.com

Visibility:
Public.

Description

[Mac] ScopedSendingEvent finds NSApp by itself. BUG=none TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=31595

Patch Set 1 #

Created: 11 years, 1 month ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+6 lines, -6 lines)			Patch
M	base/chrome_application_mac.h	View	1 chunk	+1 line, -1 line	0 comments	Download
M	base/chrome_application_mac.mm	View	2 chunks	+4 lines, -3 lines	0 comments	Download
M	chrome/browser/tab_contents/tab_contents_view_mac.mm	View	1 chunk	+1 line, -2 lines	0 comments	Download

Messages

Total messages: 8 (0 generated)

Expand Messages | Collapse Messages

Scott Hess - ex-Googler

Reviewers: dmac, Message: Not exactly a beta blocker, but I'm shaking my git clients to ...

11 years, 1 month ago (2009-11-10 19:13:57 UTC) #1

Reviewers: dmac,

Message:
Not exactly a beta blocker, but I'm shaking my git clients to see what  
falls out
...

Description:
[Mac] ScopedSendingEvent finds NSApp by itself.

BUG=none
TEST=none

Please review this at http://codereview.chromium.org/385009

Affected files:
   M base/chrome_application_mac.h
   M base/chrome_application_mac.mm
   M chrome/browser/tab_contents/tab_contents_view_mac.mm


Index: base/chrome_application_mac.h
diff --git a/base/chrome_application_mac.h b/base/chrome_application_mac.h
index  
39ef8b34a9a3d5c4d0ad117b229736d9423b24c5..d7e7989d549f8a2cee3b43893e66c10560ec64a7
 
100644
--- a/base/chrome_application_mac.h
+++ b/base/chrome_application_mac.h
@@ -26,7 +26,7 @@ namespace chrome_application_mac {
  // reset properly.
  class ScopedSendingEvent {
   public:
-  explicit ScopedSendingEvent(CrApplication* app);
+  ScopedSendingEvent();
    ~ScopedSendingEvent();

   private:
Index: base/chrome_application_mac.mm
diff --git a/base/chrome_application_mac.mm b/base/chrome_application_mac.mm
index  
d2d8f9f6e878a90c74baada05b16152b5601deb8..cdad4ab81ebd38bb7eb48281a16c76d5b684f8d8
 
100644
--- a/base/chrome_application_mac.mm
+++ b/base/chrome_application_mac.mm
@@ -29,7 +29,7 @@
  }

  - (void)sendEvent:(NSEvent*)event {
-  chrome_application_mac::ScopedSendingEvent sendingEventScoper(self);
+  chrome_application_mac::ScopedSendingEvent sendingEventScoper;
    [super sendEvent:event];
  }

@@ -37,8 +37,9 @@

  namespace chrome_application_mac {

-ScopedSendingEvent::ScopedSendingEvent(CrApplication* app) : app_(app) {
-  handling_ = [app_ isHandlingSendEvent];
+ScopedSendingEvent::ScopedSendingEvent()
+    : app_(static_cast<CrApplication*>([CrApplication sharedApplication])),
+      handling_([app_ isHandlingSendEvent]) {
    [app_ setHandlingSendEvent:YES];
  }

Index: chrome/browser/tab_contents/tab_contents_view_mac.mm
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm  
b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index  
b817315e6fef59cd1adf7d1135d19f0b76576016..9a06d66b3cae0ec4f8bbc8a7f1f3f6df84dbd120
 
100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -134,8 +134,7 @@ void TabContentsViewMac::StartDragging(const  
WebDropData& drop_data,
    // processing -sendEvent:, so Close() is deferred in that case.
    // Drags from web content do not come via -sendEvent:, this sets the
    // same flag -sendEvent: would.
-  chrome_application_mac::ScopedSendingEvent sendingEventScoper(
-      static_cast<CrApplication*>([CrApplication sharedApplication]));
+  chrome_application_mac::ScopedSendingEvent sendingEventScoper;

    // The drag invokes a nested event loop, arrange to continue
    // processing events.

Scott Hess - ex-Googler

[Sorry if dupe, got a 500 on post.] http://codereview.chromium.org/385009

11 years, 1 month ago (2009-11-10 19:16:32 UTC) #3

Scott Hess - ex-Googler

Reviewers: dmac, Message: Not exactly a beta blocker, but I'm shaking my git clients to ...

11 years, 1 month ago (2009-11-10 19:20:01 UTC) #4

Reviewers: dmac,

Message:
Not exactly a beta blocker, but I'm shaking my git clients to see what  
falls out
...

Description:
[Mac] ScopedSendingEvent finds NSApp by itself.

BUG=none
TEST=none

Please review this at http://codereview.chromium.org/385009

Affected files:
   M base/chrome_application_mac.h
   M base/chrome_application_mac.mm
   M chrome/browser/tab_contents/tab_contents_view_mac.mm


Index: base/chrome_application_mac.h
diff --git a/base/chrome_application_mac.h b/base/chrome_application_mac.h
index  
39ef8b34a9a3d5c4d0ad117b229736d9423b24c5..d7e7989d549f8a2cee3b43893e66c10560ec64a7
 
100644
--- a/base/chrome_application_mac.h
+++ b/base/chrome_application_mac.h
@@ -26,7 +26,7 @@ namespace chrome_application_mac {
  // reset properly.
  class ScopedSendingEvent {
   public:
-  explicit ScopedSendingEvent(CrApplication* app);
+  ScopedSendingEvent();
    ~ScopedSendingEvent();

   private:
Index: base/chrome_application_mac.mm
diff --git a/base/chrome_application_mac.mm b/base/chrome_application_mac.mm
index  
d2d8f9f6e878a90c74baada05b16152b5601deb8..cdad4ab81ebd38bb7eb48281a16c76d5b684f8d8
 
100644
--- a/base/chrome_application_mac.mm
+++ b/base/chrome_application_mac.mm
@@ -29,7 +29,7 @@
  }

  - (void)sendEvent:(NSEvent*)event {
-  chrome_application_mac::ScopedSendingEvent sendingEventScoper(self);
+  chrome_application_mac::ScopedSendingEvent sendingEventScoper;
    [super sendEvent:event];
  }

@@ -37,8 +37,9 @@

  namespace chrome_application_mac {

-ScopedSendingEvent::ScopedSendingEvent(CrApplication* app) : app_(app) {
-  handling_ = [app_ isHandlingSendEvent];
+ScopedSendingEvent::ScopedSendingEvent()
+    : app_(static_cast<CrApplication*>([CrApplication sharedApplication])),
+      handling_([app_ isHandlingSendEvent]) {
    [app_ setHandlingSendEvent:YES];
  }

Index: chrome/browser/tab_contents/tab_contents_view_mac.mm
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm  
b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index  
b817315e6fef59cd1adf7d1135d19f0b76576016..9a06d66b3cae0ec4f8bbc8a7f1f3f6df84dbd120
 
100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -134,8 +134,7 @@ void TabContentsViewMac::StartDragging(const  
WebDropData& drop_data,
    // processing -sendEvent:, so Close() is deferred in that case.
    // Drags from web content do not come via -sendEvent:, this sets the
    // same flag -sendEvent: would.
-  chrome_application_mac::ScopedSendingEvent sendingEventScoper(
-      static_cast<CrApplication*>([CrApplication sharedApplication]));
+  chrome_application_mac::ScopedSendingEvent sendingEventScoper;

    // The drag invokes a nested event loop, arrange to continue
    // processing events.

LGTM

http://codereview.chromium.org/385009

Expand Messages | Collapse Messages