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

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

Issue 6821003: [Mac] First pass at multiple selection in the tabstrip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase ToT Created 9 years, 8 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 | « no previous file | chrome/browser/ui/cocoa/tabs/tab_controller.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 6441e3bed6b4f55520f2dac481028f45469bc72b..044032b3018ac679002880495b28678b101657ce 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1217,8 +1217,8 @@ enum {
browser_->tabstrip_model()->DetachTabContentsAt(index);
}
-- (NSView*)selectedTabView {
- return [tabStripController_ selectedTabView];
+- (NSView*)activeTabView {
+ return [tabStripController_ activeTabView];
}
- (void)setIsLoading:(BOOL)isLoading force:(BOOL)force {
@@ -1231,7 +1231,7 @@ enum {
}
- (void)focusTabContents {
- [[self window] makeFirstResponder:[tabStripController_ selectedTabView]];
+ [[self window] makeFirstResponder:[tabStripController_ activeTabView]];
}
- (void)layoutTabs {
@@ -1297,7 +1297,7 @@ enum {
tabRect.size.height = [TabStripController defaultTabHeight];
// And make sure we use the correct frame in the new view.
- [[controller tabStripController] setFrameOfSelectedTab:tabRect];
+ [[controller tabStripController] setFrameOfActiveTab:tabRect];
return controller;
}
@@ -1412,7 +1412,7 @@ enum {
return !browser_->tabstrip_model()->empty();
}
-- (NSString*)selectedTabTitle {
+- (NSString*)activeTabTitle {
TabContents* contents = browser_->GetSelectedTabContents();
return base::SysUTF16ToNSString(contents->GetTitle());
}
@@ -1469,7 +1469,7 @@ enum {
}
// TabStripControllerDelegate protocol.
-- (void)onSelectTabWithContents:(TabContents*)contents {
+- (void)onActivateTabWithContents:(TabContents*)contents {
// Update various elements that are interested in knowing the current
// TabContents.
@@ -1502,7 +1502,8 @@ enum {
[self updateBookmarkBarVisibilityWithAnimation:NO];
}
-- (void)onSelectedTabChange:(TabStripModelObserver::TabChangeType)change {
+- (void)onTabChanged:(TabStripModelObserver::TabChangeType)change
+ withContents:(TabContents*)contents {
// Update titles if this is the currently selected tab and if it isn't just
// the loading state which changed.
if (change != TabStripModelObserver::LOADING_ONLY)
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tabs/tab_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698