[ios] WebStateList owns all WebState it manages.

ios/chrome/browser/ui/tab_switcher/tab_switcher_controller.mm

 // Copyright 2015 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 "ios/chrome/browser/ui/tab_switcher/tab_switcher_controller.h"
 
 #include "base/ios/block_types.h"
 #include "base/ios/weak_nsobject.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/metrics/user_metrics.h"
@@ skipping 32 matching lines @@
 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_view.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
 #import "ios/chrome/browser/ui/toolbar/toolbar_owner.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer.h"
-#import "ios/web/web_state/ui/crw_web_controller.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
 // Offsets for computing the panels' indexes in the TabSwitcherView.
 const int kSignInPromoPanelIndex = 2;
 const int kHeaderDistantSessionIndexOffset = 2;
 const int kLocalTabsOffTheRecordPanelIndex = 0;
 const int kLocalTabsOnTheRecordPanelIndex = 1;
@@ skipping 757 matching lines @@
 - (void)tabSwitcherDismissWithCurrentSelectedModel {
   TabModel* model = [self currentSelectedModel];
   base::RecordAction(base::UserMetricsAction("MobileTabSwitcherClose"));
   [self tabSwitcherDismissWithModel:model];
 }
 
 - (Tab*)dismissWithNewTabAnimation:(const GURL&)URL
                            atIndex:(NSUInteger)position
                         transition:(ui::PageTransition)transition
                           tabModel:(TabModel*)tabModel {
-  web::NavigationManager::WebLoadParams params(URL);
-  params.referrer = web::Referrer();
-  params.transition_type = transition;
+  NSUInteger tabIndex = position;
+  if (position > tabModel.count)
+    tabIndex = tabModel.count;
 
-  DCHECK(tabModel.browserState);
+  Tab* tab = [tabModel insertTabWithURL:URL

[rohitrao (ping after 24h), 2017/04/03 17:49:35]

Could you use insertTabWithLoadParams here instead?

[sdefresne, 2017/04/04 13:47:57]

Done.

+                               referrer:web::Referrer()
+                             transition:transition
+                                 opener:nil
+                            openedByDOM:NO
+                                atIndex:tabIndex
+                           inBackground:NO];
 
-  base::scoped_nsobject<Tab> tab([[Tab alloc]
-      initWithBrowserState:tabModel.browserState
-                    opener:nil
-               openedByDOM:NO
-                     model:tabModel]);
-  [tab webController].webUsageEnabled = tabModel.webUsageEnabled;
-
-  ProceduralBlock dismissWithNewTab = ^{
-    NSUInteger tabIndex = position;
-    if (position > tabModel.count)
-      tabIndex = tabModel.count;
-    [tabModel insertTab:tab atIndex:tabIndex];
-
-    if (tabModel.tabUsageRecorder)
-      tabModel.tabUsageRecorder->TabCreatedForSelection(tab);
-
-    [[tab webController] loadWithParams:params];
-
-    if (tabModel.webUsageEnabled) {
-      [tab setWebUsageEnabled:tabModel.webUsageEnabled];
-      [[tab webController] triggerPendingLoad];
-    }
-
-    NSDictionary* userInfo = @{
-      kTabModelTabKey : tab,
-      kTabModelOpenInBackgroundKey : @(NO),
-    };
-
-    [[NSNotificationCenter defaultCenter]
-        postNotificationName:kTabModelNewTabWillOpenNotification
-                      object:self
-                    userInfo:userInfo];
-
-    [tabModel setCurrentTab:tab];
-
-    [self
-        tabSwitcherDismissWithModel:tabModel
+  [self tabSwitcherDismissWithModel:tabModel
                            animated:YES
                      withCompletion:^{
                        [self.delegate tabSwitcherDismissTransitionDidEnd:self];
                      }];
-  };
 
-  dismissWithNewTab();
   return tab;
 }
 
 - (BOOL)isPanelIndexForLocalSession:(NSUInteger)panelIndex {
   return panelIndex == kLocalTabsOnTheRecordPanelIndex ||
          panelIndex == kLocalTabsOffTheRecordPanelIndex;
 }
 
 - (void)openTabWithContentOfDistantTab:
     (synced_sessions::DistantTab const*)distantTab {
@@ skipping 329 matching lines @@
         base::UserMetricsAction("MobileTabSwitcherOpenNonIncognitoTab"));
   }
 }
 
 - (void)tabSwitcherPanelController:
             (TabSwitcherPanelController*)tabSwitcherPanelController
                   didCloseLocalTab:(Tab*)tab {
   DCHECK(tab);
   const TabSwitcherSessionType panelSessionType =
       tabSwitcherPanelController.sessionType;
-  [tab close];
+  TabModel* tabModel =
+      panelSessionType == TabSwitcherSessionType::OFF_THE_RECORD_SESSION
+          ? [_tabSwitcherModel otrTabModel]
+          : [_tabSwitcherModel mainTabModel];
+  [tabModel closeTab:tab];

[rohitrao (ping after 24h), 2017/04/03 17:49:35]

DCHECK_NE(NSNotFound, [tabModel indexOfTab:tab]), to make sure we got the right
tabmodel?

[sdefresne, 2017/04/04 13:47:56]

Done.

+
   if (panelSessionType == TabSwitcherSessionType::OFF_THE_RECORD_SESSION) {
     base::RecordAction(
         base::UserMetricsAction("MobileTabSwitcherCloseIncognitoTab"));
   } else {
     base::RecordAction(
         base::UserMetricsAction("MobileTabSwitcherCloseNonIncognitoTab"));
   }
 }
 
 - (void)tabSwitcherPanelControllerDidUpdateOverlayViewVisibility:
     (TabSwitcherPanelController*)tabSwitcherPanelController {
   [_tabSwitcherView updateOverlayButtonState];
 }
 
 @end