| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 5 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 // Forget any existing relationships, we don't want to make things too | 185 // Forget any existing relationships, we don't want to make things too |
| 186 // confusing by having multiple groups active at the same time. | 186 // confusing by having multiple groups active at the same time. |
| 187 ForgetAllOpeners(); | 187 ForgetAllOpeners(); |
| 188 } | 188 } |
| 189 data->opener = active_contents; | 189 data->opener = active_contents; |
| 190 } | 190 } |
| 191 | 191 |
| 192 web_modal::WebContentsModalDialogManager* modal_dialog_manager = | 192 web_modal::WebContentsModalDialogManager* modal_dialog_manager = |
| 193 web_modal::WebContentsModalDialogManager::FromWebContents(contents); | 193 web_modal::WebContentsModalDialogManager::FromWebContents(contents); |
| 194 if (modal_dialog_manager) | 194 if (modal_dialog_manager) |
| 195 data->blocked = modal_dialog_manager->IsShowingDialog(); | 195 data->blocked = modal_dialog_manager->IsDialogActive(); |
| 196 | 196 |
| 197 contents_data_.insert(contents_data_.begin() + index, data); | 197 contents_data_.insert(contents_data_.begin() + index, data); |
| 198 | 198 |
| 199 selection_model_.IncrementFrom(index); | 199 selection_model_.IncrementFrom(index); |
| 200 | 200 |
| 201 FOR_EACH_OBSERVER(TabStripModelObserver, observers_, | 201 FOR_EACH_OBSERVER(TabStripModelObserver, observers_, |
| 202 TabInsertedAt(contents, index, active)); | 202 TabInsertedAt(contents, index, active)); |
| 203 if (active) { | 203 if (active) { |
| 204 ui::ListSelectionModel new_model; | 204 ui::ListSelectionModel new_model; |
| 205 new_model.Copy(selection_model_); | 205 new_model.Copy(selection_model_); |
| (...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1287 void TabStripModel::ForgetOpenersAndGroupsReferencing( | 1287 void TabStripModel::ForgetOpenersAndGroupsReferencing( |
| 1288 const WebContents* tab) { | 1288 const WebContents* tab) { |
| 1289 for (WebContentsDataVector::const_iterator i = contents_data_.begin(); | 1289 for (WebContentsDataVector::const_iterator i = contents_data_.begin(); |
| 1290 i != contents_data_.end(); ++i) { | 1290 i != contents_data_.end(); ++i) { |
| 1291 if ((*i)->group == tab) | 1291 if ((*i)->group == tab) |
| 1292 (*i)->group = NULL; | 1292 (*i)->group = NULL; |
| 1293 if ((*i)->opener == tab) | 1293 if ((*i)->opener == tab) |
| 1294 (*i)->opener = NULL; | 1294 (*i)->opener = NULL; |
| 1295 } | 1295 } |
| 1296 } | 1296 } |
| OLD | NEW |