chrome/browser/ui/tabs/tab_strip_model.cc - Issue 12298037: Revert 183123

Side by Side Diff: chrome/browser/ui/tabs/tab_strip_model.cc

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log

Property Changes:

Deleted: svn:mergeinfo

« no previous file with comments | « chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc ('k') | chrome/browser/ui/views/browser_action_view.cc » ('j') | no next file with comments »

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

11 #include "base/metrics/histogram.h"	11 #include "base/metrics/histogram.h"

12 #include "base/stl_util.h"	12 #include "base/stl_util.h"

13 #include "chrome/app/chrome_command_ids.h"	13 #include "chrome/app/chrome_command_ids.h"

14 #include "chrome/browser/browser_shutdown.h"	14 #include "chrome/browser/browser_shutdown.h"

15 #include "chrome/browser/defaults.h"	15 #include "chrome/browser/defaults.h"

16 #include "chrome/browser/extensions/tab_helper.h"	16 #include "chrome/browser/extensions/tab_helper.h"

17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"	17 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"

19 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"	18 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"

20 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"	19 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"

21 #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"	20 #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"

22 #include "chrome/common/url_constants.h"	21 #include "chrome/common/url_constants.h"

23 #include "content/public/browser/notification_service.h"	22 #include "content/public/browser/notification_service.h"

24 #include "content/public/browser/notification_types.h"	23 #include "content/public/browser/notification_types.h"

25 #include "content/public/browser/render_process_host.h"	24 #include "content/public/browser/render_process_host.h"

26 #include "content/public/browser/user_metrics.h"	25 #include "content/public/browser/user_metrics.h"

27 #include "content/public/browser/web_contents.h"	26 #include "content/public/browser/web_contents.h"

(...skipping 1182 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1210 void TabStripModel::ForgetOpenersAndGroupsReferencing(	1209 void TabStripModel::ForgetOpenersAndGroupsReferencing(

1211 const WebContents* tab) {	1210 const WebContents* tab) {

1212 for (WebContentsDataVector::const_iterator i = contents_data_.begin();	1211 for (WebContentsDataVector::const_iterator i = contents_data_.begin();

1213 i != contents_data_.end(); ++i) {	1212 i != contents_data_.end(); ++i) {

1214 if ((*i)->group == tab)	1213 if ((*i)->group == tab)

1215 (*i)->group = NULL;	1214 (*i)->group = NULL;

1216 if ((*i)->opener == tab)	1215 if ((*i)->opener == tab)

1217 (*i)->opener = NULL;	1216 (*i)->opener = NULL;

1218 }	1217 }

1219 }	1218 }

OLD	NEW