Reduce header dependencies in browser/

- remove unneeded header includes
- move implementation bits out of headers
- more explicit header deps

In my scan of headers I got up to (including) dom_ui.

Review URL: http://codereview.chromium.org/126071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18353 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 24 insertions, 0 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index b1007c0..38f5818 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -14,6 +14,7 @@
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/character_encoding.h"
@@ -292,6 +293,18 @@ void Browser::CreateBrowserWindow() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// Getters & Setters
+
+const std::vector<std::wstring>& Browser::user_data_dir_profiles() const {
+  return g_browser_process->user_data_dir_profiles();
+}
+
+void Browser::set_user_data_dir_profiles(
+    const std::vector<std::wstring>& profiles) {
+  g_browser_process->user_data_dir_profiles() = profiles;
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // Browser, Creation Helpers:
 
 // static
@@ -2709,3 +2722,14 @@ void Browser::RegisterAppPrefs(const std::wstring& app_name) {
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }
+
+///////////////////////////////////////////////////////////////////////////////
+// BrowserToolbarModel (private):
+
+NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
+  // This |current_tab| can be NULL during the initialization of the
+  // toolbar during window creation (i.e. before any tabs have been added
+  // to the window).
+  TabContents* current_tab = browser_->GetSelectedTabContents();
+  return current_tab ? &current_tab->controller() : NULL;
+}