chrome/browser/toolbar_model.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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/toolbar_model.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 3 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

« no previous file with comments | « chrome/browser/task_manager.cc ('k') | chrome/browser/translate/translate_manager.cc » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/toolbar_model.h"	5 #include "chrome/browser/toolbar_model.h"

6	6

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

8 #include "chrome/browser/autocomplete/autocomplete_edit.h"	8 #include "chrome/browser/autocomplete/autocomplete_edit.h"

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

10 #include "chrome/browser/cert_store.h"	10 #include "chrome/browser/cert_store.h"

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

12 #include "chrome/browser/profile.h"	12 #include "chrome/browser/profile.h"

13 #include "chrome/browser/ssl/ssl_error_info.h"	13 #include "chrome/browser/ssl/ssl_error_info.h"

14 #include "chrome/browser/tab_contents/navigation_controller.h"	14 #include "chrome/browser/tab_contents/navigation_controller.h"

15 #include "chrome/browser/tab_contents/navigation_entry.h"	15 #include "chrome/browser/tab_contents/navigation_entry.h"

16 #include "chrome/browser/tab_contents/tab_contents.h"	16 #include "chrome/browser/tab_contents/tab_contents.h"

17 #include "chrome/common/chrome_constants.h"	17 #include "chrome/common/chrome_constants.h"

18 #include "chrome/common/pref_names.h"	18 #include "chrome/common/pref_names.h"

19 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

20 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

21 #include "grit/theme_resources.h"	21 #include "grit/theme_resources.h"

(...skipping 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 return SSLManager::GetEVCertName(*cert);	120 return SSLManager::GetEVCertName(*cert);

121 }	121 }

122	122

123 NavigationController* ToolbarModel::GetNavigationController() const {	123 NavigationController* ToolbarModel::GetNavigationController() const {

124 // This \|current_tab\| can be NULL during the initialization of the	124 // This \|current_tab\| can be NULL during the initialization of the

125 // toolbar during window creation (i.e. before any tabs have been added	125 // toolbar during window creation (i.e. before any tabs have been added

126 // to the window).	126 // to the window).

127 TabContents* current_tab = browser_->GetSelectedTabContents();	127 TabContents* current_tab = browser_->GetSelectedTabContents();

128 return current_tab ? &current_tab->controller() : NULL;	128 return current_tab ? &current_tab->controller() : NULL;

129 }	129 }

OLD	NEW