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

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

Issue 154083008: Remove Tabpose feature on mac, and supporting infrastructure (PaintAtSize) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, merge 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 | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/tabpose_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 893520378ddffe401029fd69e0dadbdf576d30f9..55cf89d0840a8b7ca7c25980cad2524250cd862d 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -59,7 +59,6 @@
#import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
#import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
-#import "chrome/browser/ui/cocoa/tabpose_window.h"
#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
#import "chrome/browser/ui/cocoa/tabs/tab_view.h"
@@ -1739,7 +1738,6 @@ enum {
// TODO(pinkerton): figure out page-up, http://crbug.com/16305
} else if (deltaY < -0.5) {
// TODO(pinkerton): figure out page-down, http://crbug.com/16305
- chrome::ExecuteCommand(browser_.get(), IDC_TABPOSE);
}
// Ensure the command is valid first (ExecuteCommand() won't do that) and
@@ -2167,47 +2165,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
return [focused isKindOfClass:[AutocompleteTextFieldEditor class]];
}
-- (void)tabposeWillClose:(NSNotification*)notif {
- // Re-show the container after Tabpose closes.
- [[infoBarContainerController_ view] setHidden:NO];
-}
-
-- (void)openTabpose {
- NSUInteger modifierFlags = [[NSApp currentEvent] modifierFlags];
- BOOL slomo = (modifierFlags & NSShiftKeyMask) != 0;
-
- // Cover info bars, inspector window, and detached bookmark bar on NTP.
- // Do not cover download shelf.
- NSRect activeArea = [[self tabContentArea] frame];
- // Take out the anti-spoof height so that Tabpose doesn't draw on top of the
- // browser chrome.
- activeArea.size.height +=
- NSHeight([[infoBarContainerController_ view] frame]) -
- [infoBarContainerController_ overlappingTipHeight];
- if ([self isBookmarkBarVisible] && [self placeBookmarkBarBelowInfoBar]) {
- NSView* bookmarkBarView = [bookmarkBarController_ view];
- activeArea.size.height += NSHeight([bookmarkBarView frame]);
- }
-
- // Hide the infobar container so that the anti-spoof bulge doesn't show when
- // Tabpose is open.
- [[infoBarContainerController_ view] setHidden:YES];
-
- TabposeWindow* window =
- [TabposeWindow openTabposeFor:[self window]
- rect:activeArea
- slomo:slomo
- tabStripModel:browser_->tab_strip_model()];
-
- // When the Tabpose window closes, the infobar container needs to be made
- // visible again.
- NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
- [center addObserver:self
- selector:@selector(tabposeWillClose:)
- name:NSWindowWillCloseNotification
- object:window];
-}
-
@end // @implementation BrowserWindowController(Fullscreen)
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/tabpose_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698