| 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/base_bubble_controller.h" | 5 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac/bundle_locations.h" | 8 #include "base/mac/bundle_locations.h" |
| 9 #include "base/mac/closure_blocks_leopard_compat.h" | 9 #include "base/mac/closure_blocks_leopard_compat.h" |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| 11 #include "base/memory/scoped_nsobject.h" | 11 #include "base/memory/scoped_nsobject.h" |
| 12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 14 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 14 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| 15 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" | 15 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" |
| 16 #include "grit/generated_resources.h" | 16 #include "grit/generated_resources.h" |
| 17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
| 18 | 18 |
| 19 @interface BaseBubbleController (Private) | 19 @interface BaseBubbleController (Private) |
| 20 - (void)updateOriginFromAnchor; | 20 - (void)updateOriginFromAnchor; |
| 21 - (void)activateTabWithContents:(TabContentsWrapper*)newContents | 21 - (void)activateTabWithContents:(TabContents*)newContents |
| 22 previousContents:(TabContentsWrapper*)oldContents | 22 previousContents:(TabContents*)oldContents |
| 23 atIndex:(NSInteger)index | 23 atIndex:(NSInteger)index |
| 24 userGesture:(bool)wasUserGesture; | 24 userGesture:(bool)wasUserGesture; |
| 25 @end | 25 @end |
| 26 | 26 |
| 27 #if !defined(MAC_OS_X_VERSION_10_6) || \ | 27 #if !defined(MAC_OS_X_VERSION_10_6) || \ |
| 28 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | 28 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 |
| 29 typedef unsigned long long NSEventMask; | 29 typedef unsigned long long NSEventMask; |
| 30 | 30 |
| 31 @interface NSEvent (SnowLeopardDeclarations) | 31 @interface NSEvent (SnowLeopardDeclarations) |
| 32 + (id)addLocalMonitorForEventsMatchingMask:(NSEventMask)mask | 32 + (id)addLocalMonitorForEventsMatchingMask:(NSEventMask)mask |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 break; | 284 break; |
| 285 | 285 |
| 286 default: | 286 default: |
| 287 NOTREACHED(); | 287 NOTREACHED(); |
| 288 } | 288 } |
| 289 | 289 |
| 290 origin.y -= NSHeight([window frame]); | 290 origin.y -= NSHeight([window frame]); |
| 291 [window setFrameOrigin:origin]; | 291 [window setFrameOrigin:origin]; |
| 292 } | 292 } |
| 293 | 293 |
| 294 - (void)activateTabWithContents:(TabContentsWrapper*)newContents | 294 - (void)activateTabWithContents:(TabContents*)newContents |
| 295 previousContents:(TabContentsWrapper*)oldContents | 295 previousContents:(TabContents*)oldContents |
| 296 atIndex:(NSInteger)index | 296 atIndex:(NSInteger)index |
| 297 userGesture:(bool)wasUserGesture { | 297 userGesture:(bool)wasUserGesture { |
| 298 // The user switched tabs; close. | 298 // The user switched tabs; close. |
| 299 [self close]; | 299 [self close]; |
| 300 } | 300 } |
| 301 | 301 |
| 302 @end // BaseBubbleController | 302 @end // BaseBubbleController |
| OLD | NEW |