Index: ios/chrome/browser/tabs/tab_model.h |
diff --git a/ios/chrome/browser/tabs/tab_model.h b/ios/chrome/browser/tabs/tab_model.h |
index fa528dea0a93b6cba522e880c09ad8450c8d23a6..a5906b2bac5203819d1c4135d20c35b3cd5303a0 100644 |
--- a/ios/chrome/browser/tabs/tab_model.h |
+++ b/ios/chrome/browser/tabs/tab_model.h |
@@ -143,9 +143,6 @@ NSUInteger const kTabPositionAutomatically = NSNotFound; |
- (Tab*)tabAtIndex:(NSUInteger)index; |
- (NSUInteger)indexOfTab:(Tab*)tab; |
-// Returns the tab object associated from the given JS-level window name. |
-- (Tab*)tabWithWindowName:(NSString*)windowName; |
- |
// Returns the next Tab, starting after |tab|, spawned by the specified Tab, If |
// |after| is a valid tab, will only look at tabs following it (in tab ordering, |
// not order opened) in the list, even if it comes before |tab|. Returns nil if |
@@ -174,29 +171,27 @@ NSUInteger const kTabPositionAutomatically = NSNotFound; |
// Add/modify tabs. |
-// Either opens a tab at the specified URL and register its JS-supplied window |
-// name if appropriate, or navigates the tab corresponding to |windowName| to |
-// the given |URL|. Will also update the current tab if |inBackground| is NO. |
-// |openedByDOM| is YES if the page was opened by DOM. The |index| parameter can |
-// be set to TabModelConstants::kTabPositionAutomatically if the caller doesn't |
-// have a preference for the position of the tab. |
-- (Tab*)insertOrUpdateTabWithURL:(const GURL&)URL |
- referrer:(const web::Referrer&)referrer |
- transition:(ui::PageTransition)transition |
- windowName:(NSString*)windowName |
- opener:(Tab*)parentTab |
- openedByDOM:(BOOL)openedByDOM |
- atIndex:(NSUInteger)index |
- inBackground:(BOOL)inBackground; |
+// Opens a tab at the specified URL. For certain transition types, will consult |
+// the order controller and thus may only use |index| as a hint. |parentTab| may |
+// be nil if there is no parent associated with this new tab. |openedByDOM| is |
+// YES if the page was opened by DOM. The |index| parameter can be set to |
+// TabModelConstants::kTabPositionAutomatically if the caller doesn't have a |
+// preference for the position of the tab. |
+- (Tab*)insertTabWithURL:(const GURL&)URL |
+ referrer:(const web::Referrer&)referrer |
+ transition:(ui::PageTransition)transition |
+ opener:(Tab*)parentTab |
+ openedByDOM:(BOOL)openedByDOM |
+ atIndex:(NSUInteger)index |
+ inBackground:(BOOL)inBackground; |
// As above, but using WebLoadParams to specify various optional parameters. |
-- (Tab*)insertOrUpdateTabWithLoadParams: |
+- (Tab*)insertTabWithLoadParams: |
(const web::NavigationManager::WebLoadParams&)params |
- windowName:(NSString*)windowName |
- opener:(Tab*)parentTab |
- openedByDOM:(BOOL)openedByDOM |
- atIndex:(NSUInteger)index |
- inBackground:(BOOL)inBackground; |
+ opener:(Tab*)parentTab |
+ openedByDOM:(BOOL)openedByDOM |
+ atIndex:(NSUInteger)index |
+ inBackground:(BOOL)inBackground; |
// Opens a blank tab without URL and updates the current tab if |inBackground| |
// is NO. |
@@ -291,20 +286,16 @@ NSUInteger const kTabPositionAutomatically = NSNotFound; |
@interface TabModel (PrivateForTestingOnly) |
-// Opens a tab at the specified URL and register its JS-supplied window name if |
-// appropriate. The newly created tab will not be the child of any other tab. |
-// This does not go through the order controller. Used a page transition of |
-// TYPED. |
-- (Tab*)addTabWithURL:(const GURL&)URL |
- referrer:(const web::Referrer&)referrer |
- windowName:(NSString*)windowName; |
+// Opens a tab at the specified URL. The newly created tab will not be the child |
+// of any other tab. This does not go through the order controller. Used a page |
+// transition of TYPED. |
+- (Tab*)addTabWithURL:(const GURL&)URL referrer:(const web::Referrer&)referrer; |
// Inserts a new tab at the given |index| with the given |URL| and |referrer|. |
// This does not go through the order controller. Uses a page transition of |
// TYPED. |
- (Tab*)insertTabWithURL:(const GURL&)URL |
referrer:(const web::Referrer&)referrer |
- windowName:(NSString*)windowName |
opener:(Tab*)parentTab |
atIndex:(NSUInteger)index; |