chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc - Issue 10696148: Move TabStripModelDelegate off Browser into its own class.

Side by Side Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 10696148: Move TabStripModelDelegate off Browser into its own class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 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

« no previous file with comments | « chrome/browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/views/tabs/browser_tab_strip_controller.h"	5 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"

6	6

7 #include "base/auto_reset.h"	7 #include "base/auto_reset.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/extensions/extension_tab_helper.h"	10 #include "chrome/browser/extensions/extension_tab_helper.h"

11 #include "chrome/browser/favicon/favicon_tab_helper.h"	11 #include "chrome/browser/favicon/favicon_tab_helper.h"

12 #include "chrome/browser/prefs/pref_service.h"	12 #include "chrome/browser/prefs/pref_service.h"

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

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

15 #include "chrome/browser/ui/browser_tabstrip.h"	15 #include "chrome/browser/ui/browser_tabstrip.h"

16 #include "chrome/browser/ui/search/search.h"	16 #include "chrome/browser/ui/search/search.h"

17 #include "chrome/browser/ui/search/search_delegate.h"	17 #include "chrome/browser/ui/search/search_delegate.h"

18 #include "chrome/browser/ui/search/search_model.h"	18 #include "chrome/browser/ui/search/search_model.h"

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

20 #include "chrome/browser/ui/tabs/tab_menu_model.h"	20 #include "chrome/browser/ui/tabs/tab_menu_model.h"

21 #include "chrome/browser/ui/tabs/tab_strip_model.h"	21 #include "chrome/browser/ui/tabs/tab_strip_model.h"

	22 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"

22 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"	23 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"

23 #include "chrome/browser/ui/views/tabs/tab.h"	24 #include "chrome/browser/ui/views/tabs/tab.h"

24 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"	25 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"

25 #include "chrome/browser/ui/views/tabs/tab_strip.h"	26 #include "chrome/browser/ui/views/tabs/tab_strip.h"

26 #include "chrome/common/chrome_notification_types.h"	27 #include "chrome/common/chrome_notification_types.h"

27 #include "chrome/common/chrome_switches.h"	28 #include "chrome/common/chrome_switches.h"

28 #include "chrome/common/pref_names.h"	29 #include "chrome/common/pref_names.h"

29 #include "chrome/common/url_constants.h"	30 #include "chrome/common/url_constants.h"

30 #include "content/public/browser/notification_service.h"	31 #include "content/public/browser/notification_service.h"

31 #include "content/public/browser/render_view_host.h"	32 #include "content/public/browser/render_view_host.h"

(...skipping 552 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
584 SetTabRendererDataFromModel(contents->web_contents(), index, &data, NEW_TAB);	585 SetTabRendererDataFromModel(contents->web_contents(), index, &data, NEW_TAB);

585 tabstrip_->AddTabAt(index, data, is_active);	586 tabstrip_->AddTabAt(index, data, is_active);

586 }	587 }

587	588

588 void BrowserTabStripController::UpdateLayoutType() {	589 void BrowserTabStripController::UpdateLayoutType() {

589 bool adjust_layout = false;	590 bool adjust_layout = false;

590 TabStripLayoutType layout_type =	591 TabStripLayoutType layout_type =

591 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);	592 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);

592 tabstrip_->SetLayoutType(layout_type, adjust_layout);	593 tabstrip_->SetLayoutType(layout_type, adjust_layout);

593 }	594 }

OLD	NEW