Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: chrome/browser/toolbar_model.cc

Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes. Created 10 years, 1 month 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/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.h" 8 #include "chrome/browser/autocomplete/autocomplete.h"
9 #include "chrome/browser/autocomplete/autocomplete_edit.h" 9 #include "chrome/browser/autocomplete/autocomplete_edit.h"
10 #include "chrome/browser/browser.h"
11 #include "chrome/browser/cert_store.h" 10 #include "chrome/browser/cert_store.h"
12 #include "chrome/browser/prefs/pref_service.h" 11 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profile.h" 12 #include "chrome/browser/profile.h"
14 #include "chrome/browser/ssl/ssl_error_info.h" 13 #include "chrome/browser/ssl/ssl_error_info.h"
15 #include "chrome/browser/tab_contents/navigation_controller.h" 14 #include "chrome/browser/tab_contents/navigation_controller.h"
16 #include "chrome/browser/tab_contents/navigation_entry.h" 15 #include "chrome/browser/tab_contents/navigation_entry.h"
17 #include "chrome/browser/tab_contents/tab_contents.h" 16 #include "chrome/browser/tab_contents/tab_contents.h"
17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/common/chrome_constants.h" 18 #include "chrome/common/chrome_constants.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
23 #include "net/base/cert_status_flags.h" 23 #include "net/base/cert_status_flags.h"
24 #include "net/base/net_util.h" 24 #include "net/base/net_util.h"
25 25
26 ToolbarModel::ToolbarModel(Browser* browser) 26 ToolbarModel::ToolbarModel(Browser* browser)
27 : browser_(browser), 27 : browser_(browser),
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698