| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 5 #import "chrome/browser/ui/cocoa/info_bubble_window.h" |
| 6 | 6 |
| 7 #include <Carbon/Carbon.h> | 7 #include <Carbon/Carbon.h> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 // window. | 240 // window. |
| 241 - (void)sendEvent:(NSEvent*)theEvent { | 241 - (void)sendEvent:(NSEvent*)theEvent { |
| 242 if (!closing_) | 242 if (!closing_) |
| 243 [super sendEvent:theEvent]; | 243 [super sendEvent:theEvent]; |
| 244 } | 244 } |
| 245 | 245 |
| 246 - (BOOL)isClosing { | 246 - (BOOL)isClosing { |
| 247 return closing_; | 247 return closing_; |
| 248 } | 248 } |
| 249 | 249 |
| 250 // Override -[NSWindow addChildWindow] to prevent ShareKit bugs propagating | |
| 251 // to the browser window. See http://crbug.com/475855. | |
| 252 - (void)addChildWindow:(NSWindow*)childWindow | |
| 253 ordered:(NSWindowOrderingMode)orderingMode { | |
| 254 [[self parentWindow] removeChildWindow:self]; | |
| 255 [super addChildWindow:childWindow ordered:orderingMode]; | |
| 256 } | |
| 257 | |
| 258 @end | 250 @end |
| OLD | NEW |