Removal of Profile from content part 1.

chrome/browser/ui/toolbar/toolbar_model.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 22 matching lines @@
 ToolbarModel::~ToolbarModel() {
 }
 
 // ToolbarModel Implementation.
 std::wstring ToolbarModel::GetText() const {
   GURL url(chrome::kAboutBlankURL);
   std::string languages;  // Empty if we don't have a |navigation_controller|.
 
   NavigationController* navigation_controller = GetNavigationController();
   if (navigation_controller) {
-    languages = navigation_controller->profile()->GetPrefs()->GetString(
-        prefs::kAcceptLanguages);
+    Profile* profile = static_cast<Profile*>(navigation_controller->context());
+    languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
     NavigationEntry* entry = navigation_controller->GetActiveEntry();
     if (!navigation_controller->tab_contents()->ShouldDisplayURL()) {
       // Explicitly hide the URL for this tab.
       url = GURL();
     } else if (entry) {
       url = entry->virtual_url();
     }
   }
   if (url.spec().length() > content::kMaxURLDisplayChars)
     url = url.IsStandard() ? url.GetOrigin() : GURL(url.scheme() + ":");
@@ skipping 84 matching lines @@
       UTF8ToUTF16(cert.subject().country_name));
 }
 
 NavigationController* ToolbarModel::GetNavigationController() const {
   // 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;
 }