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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 42b280c99c7906eca792bccd787aa48d0dc75d5c..fa209a73ab2ee6b50f24a5d239da0b748c256643 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -2018,7 +2018,7 @@ private:
// Drop in a new tab to the left of tab |i|?
if (point.x < (frame.origin.x + kLRProportion * frame.size.width)) {
*index = i;
- *disposition = NEW_FOREGROUND_TAB;
+ *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
return;
}
@@ -2026,7 +2026,7 @@ private:
if (point.x <= (frame.origin.x +
(1.0 - kLRProportion) * frame.size.width)) {
*index = i;
- *disposition = CURRENT_TAB;
+ *disposition = WindowOpenDisposition::CURRENT_TAB;
return;
}
@@ -2037,7 +2037,7 @@ private:
// If we've made it here, we want to append a new tab to the end.
*index = -1;
- *disposition = NEW_FOREGROUND_TAB;
+ *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
}
- (void)openURL:(GURL*)url inView:(NSView*)view at:(NSPoint)point {
@@ -2050,7 +2050,7 @@ private:
// Either insert a new tab or open in a current tab.
switch (disposition) {
- case NEW_FOREGROUND_TAB: {
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB: {
content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"));
chrome::NavigateParams params(browser_, *url,
ui::PAGE_TRANSITION_TYPED);
@@ -2061,10 +2061,10 @@ private:
chrome::Navigate(&params);
break;
}
- case CURRENT_TAB: {
+ case WindowOpenDisposition::CURRENT_TAB: {
content::RecordAction(UserMetricsAction("Tab_DropURLOnTab"));
- OpenURLParams params(
- *url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ OpenURLParams params(*url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
tabStripModel_->GetWebContentsAt(index)->OpenURL(params);
tabStripModel_->ActivateTabAt(index, true);
break;
@@ -2129,18 +2129,18 @@ private:
NSPoint arrowPos = NSMakePoint(0, arrowBaseY);
if (index == -1) {
// Append a tab at the end.
- DCHECK(disposition == NEW_FOREGROUND_TAB);
+ DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB);
NSInteger lastIndex = [tabArray_ count] - 1;
NSRect overRect = [[[tabArray_ objectAtIndex:lastIndex] view] frame];
arrowPos.x = overRect.origin.x + overRect.size.width - kTabOverlap / 2.0;
} else {
NSRect overRect = [[[tabArray_ objectAtIndex:index] view] frame];
switch (disposition) {
- case NEW_FOREGROUND_TAB:
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB:
// Insert tab (to the left of the given tab).
arrowPos.x = overRect.origin.x + kTabOverlap / 2.0;
break;
- case CURRENT_TAB:
+ case WindowOpenDisposition::CURRENT_TAB:
// Overwrite the given tab.
arrowPos.x = overRect.origin.x + overRect.size.width / 2.0;
break;
@@ -2154,7 +2154,7 @@ private:
[tabStripView_ setNeedsDisplay:YES];
// Perform a delayed tab transition if hovering directly over a tab.
- if (index != -1 && disposition == CURRENT_TAB) {
+ if (index != -1 && disposition == WindowOpenDisposition::CURRENT_TAB) {
NSInteger modelIndex = [self modelIndexFromIndex:index];
// Only start the transition if it has a valid model index (i.e. it's not
// in the middle of closing).
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm ('k') | chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698