Bar

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
@@ skipping 26 matching lines @@
 #import "chrome/browser/cocoa/fullscreen_window.h"
 #import "chrome/browser/cocoa/infobar_container_controller.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/sad_tab_controller.h"
 #import "chrome/browser/cocoa/status_bubble_mac.h"
 #import "chrome/browser/cocoa/tab_contents_controller.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_view.h"
+#import "chrome/browser/cocoa/tabpose_window.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util_mac.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
@@ skipping 88 matching lines @@
 // through it so you can drag the window by dragging on the spy guy
 @interface IncognitoImageView : NSImageView
 @end
 
 @implementation IncognitoImageView
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 @end
 
+// FIXME: private methods don't belong here
+@interface BrowserWindowController (PrivateToo)
+-(void)openTabpose:(BOOL)slomo;
+@end
 
 @implementation BrowserWindowController
 
 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window {
   while (window) {
     id controller = [window windowController];
     if ([controller isKindOfClass:[BrowserWindowController class]])
       return (BrowserWindowController*)controller;
     window = [window parentWindow];
   }
@@ skipping 746 matching lines @@
   // belong to a background window, yet this controller gets it because it is
   // the foreground window's controller and thus in the responder chain. Some
   // senders don't have this problem (for example, menus only operate on the
   // foreground window), so this is only an issue for senders that are part of
   // windows.
   BrowserWindowController* targetController = self;
   if ([sender respondsToSelector:@selector(window)])
     targetController = [[sender window] windowController];
   DCHECK([targetController isKindOfClass:[BrowserWindowController class]]);
   DCHECK(targetController->browser_.get());
-  targetController->browser_->ExecuteCommand([sender tag]);
+
+  NSInteger command = [sender tag];
+  switch (command) {
+    case IDC_TABPOSE: {
+      // FIXME: menu needs to switch between "enter/leave tabpose" depending on
+      // the current window
+      NSUInteger modifierFlags = [[NSApp currentEvent] modifierFlags];
+      [self openTabpose:(modifierFlags & NSShiftKeyMask) != 0];
+      break;
+    }
+    default:
+      targetController->browser_->ExecuteCommand(command);
+  }
 }
 
 // Same as |-commandDispatch:|, but executes commands using a disposition
 // determined by the key flags. If the window is in the background and the
 // command key is down, ignore the command key, but process any other modifiers.
 - (void)commandDispatchUsingKeyModifiers:(id)sender {
   DCHECK(sender);
   // See comment above for why we do this.
   BrowserWindowController* targetController = self;
   if ([sender respondsToSelector:@selector(window)])
@@ skipping 18 matching lines @@
   switch (command) {
     case IDC_BACK:
     case IDC_FORWARD:
     case IDC_RELOAD:
     case IDC_RELOAD_IGNORING_CACHE:
       if (disposition == CURRENT_TAB) {
         // Forcibly reset the location bar, since otherwise it won't discard any
         // ongoing user edits, since it doesn't realize this is a user-initiated
         // action.
         [targetController locationBarBridge]->Revert();
+        break;
       }
   }
   DCHECK(targetController->browser_.get());
   targetController->browser_->ExecuteCommandWithDisposition(command,
                                                             disposition);
 }
 
 // Called when another part of the internal codebase needs to execute a
 // command.
 - (void)executeCommand:(int)command {
@@ skipping 483 matching lines @@
   [shadow.get() setShadowColor:[NSColor colorWithCalibratedWhite:0.0
                                                            alpha:0.5]];
   [shadow.get() setShadowOffset:NSMakeSize(0, -1)];
   [shadow setShadowBlurRadius:2.0];
   [incognitoBadge_ setShadow:shadow];
 
   // Install the view.
   [[[[self window] contentView] superview] addSubview:incognitoBadge_];
 }
 
+-(void)openTabpose:(BOOL)slomo {
+  [TabposeWindow openTabposeFor:self slomo:slomo];
+}
+
 // Documented in 10.6+, but present starting in 10.5. Called when we get a
 // three-finger swipe.
 - (void)swipeWithEvent:(NSEvent*)event {
   // Map forwards and backwards to history; left is positive, right is negative.
   unsigned int command = 0;
   if ([event deltaX] > 0.5) {
     command = IDC_BACK;
   } else if ([event deltaX] < -0.5) {
     command = IDC_FORWARD;
   } else if ([event deltaY] > 0.5) {
-    // TODO(pinkerton): figure out page-up, http://crbug.com/16305
+    // Do nothing.
   } else if ([event deltaY] < -0.5) {
-    // TODO(pinkerton): figure out page-down, http://crbug.com/16305
+    [self openTabpose:([event modifierFlags] & NSShiftKeyMask) != 0];
   }
 
   // Ensure the command is valid first (ExecuteCommand() won't do that) and
   // then make it so.
   if (browser_->command_updater()->IsCommandEnabled(command))
     browser_->ExecuteCommandWithDisposition(command,
         event_utils::WindowOpenDispositionFromNSEvent(event));
 }
 
 // Documented in 10.6+, but present starting in 10.5. Called repeatedly during
@@ skipping 374 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)