chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. 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

« no previous file with comments | « chrome/browser/ui/views/network_profile_bubble_view.cc ('k') | chrome/browser/ui/views/task_manager_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/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 "base/prefs/pref_service.h"

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

10 #include "chrome/browser/extensions/tab_helper.h"	11 #include "chrome/browser/extensions/tab_helper.h"

11 #include "chrome/browser/favicon/favicon_tab_helper.h"	12 #include "chrome/browser/favicon/favicon_tab_helper.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/tabs/tab_menu_model.h"	16 #include "chrome/browser/ui/tabs/tab_menu_model.h"

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

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

19 #include "chrome/browser/ui/tabs/tab_utils.h"	19 #include "chrome/browser/ui/tabs/tab_utils.h"

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

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

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

(...skipping 478 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
501 SetTabRendererDataFromModel(contents, index, &data, NEW_TAB);	501 SetTabRendererDataFromModel(contents, index, &data, NEW_TAB);

502 tabstrip_->AddTabAt(index, data, is_active);	502 tabstrip_->AddTabAt(index, data, is_active);

503 }	503 }

504	504

505 void BrowserTabStripController::UpdateLayoutType() {	505 void BrowserTabStripController::UpdateLayoutType() {

506 bool adjust_layout = false;	506 bool adjust_layout = false;

507 TabStripLayoutType layout_type =	507 TabStripLayoutType layout_type =

508 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);	508 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);

509 tabstrip_->SetLayoutType(layout_type, adjust_layout);	509 tabstrip_->SetLayoutType(layout_type, adjust_layout);

510 }	510 }

OLD	NEW