diff options
Diffstat (limited to 'chrome/browser/ui/views')
| -rw-r--r-- | chrome/browser/ui/views/collected_cookies_win.cc | 14 | ||||
| -rw-r--r-- | chrome/browser/ui/views/constrained_window_views.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/default_search_view.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/views/dom_view.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc | 2 |
5 files changed, 14 insertions, 9 deletions
diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 7da33b4..45a89ce 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -286,12 +286,12 @@ views::View* CollectedCookiesWin::CreateAllowedPane() { } views::View* CollectedCookiesWin::CreateBlockedPane() { - TabSpecificContentSettings* content_settings = - TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_)-> - content_settings(); + TabContentsWrapper* wrapper = + TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_); + TabSpecificContentSettings* content_settings = wrapper->content_settings(); HostContentSettingsMap* host_content_settings_map = - tab_contents_->profile()->GetHostContentSettingsMap(); + wrapper->profile()->GetHostContentSettingsMap(); // Create the controls that go into the pane. blocked_label_ = new views::Label( @@ -483,8 +483,10 @@ void CollectedCookiesWin::AddContentException(views::TreeView* tree_view, ContentSetting setting) { CookieTreeOriginNode* origin_node = static_cast<CookieTreeOriginNode*>(tree_view->GetSelectedNode()); - origin_node->CreateContentException( - tab_contents_->profile()->GetHostContentSettingsMap(), setting); + Profile* profile = + Profile::FromBrowserContext(tab_contents_->browser_context()); + origin_node->CreateContentException(profile->GetHostContentSettingsMap(), + setting); infobar_->UpdateVisibility(true, setting, origin_node->GetTitle()); gfx::Rect bounds = GetWidget()->GetClientAreaScreenBounds(); // NativeWidgetWin::GetBounds returns the bounds relative to the parent diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index 344fd78..3fb90de 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -204,7 +204,7 @@ class ConstrainedWindowFrameView gfx::Rect CalculateClientAreaBounds(int width, int height) const; SkColor GetTitleColor() const { - return container_->owner()->profile()->IsOffTheRecord() + return container_->owner()->browser_context()->IsOffTheRecord() #if defined(OS_WIN) || !views::NativeWidgetWin::IsAeroGlassEnabled() #endif diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index 714edb47..da1a8c5 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -187,7 +187,9 @@ DefaultSearchView::DefaultSearchView(TabContents* tab_contents, proposed_provider_button_(NULL), proposed_turl_(proposed_default_turl), template_url_service_(template_url_service) { - PrefService* prefs = tab_contents->profile()->GetPrefs(); + Profile* profile = + Profile::FromBrowserContext(tab_contents->browser_context()); + PrefService* prefs = profile->GetPrefs(); SetupControls(prefs); // Show the dialog. diff --git a/chrome/browser/ui/views/dom_view.cc b/chrome/browser/ui/views/dom_view.cc index c19912f..7645cd7 100644 --- a/chrome/browser/ui/views/dom_view.cc +++ b/chrome/browser/ui/views/dom_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/dom_view.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "content/browser/tab_contents/tab_contents.h" #include "views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 6800ad2..7bca147 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -439,7 +439,7 @@ void BrowserTabStripController::SetTabRendererDataFromModel( data->url = contents->GetURL(); data->loading = contents->IsLoading(); data->crashed_status = contents->crashed_status(); - data->incognito = contents->profile()->IsOffTheRecord(); + data->incognito = contents->browser_context()->IsOffTheRecord(); data->show_icon = wrapper->favicon_tab_helper()->ShouldDisplayFavicon(); data->mini = model_->IsMiniTab(model_index); data->blocked = model_->IsTabBlocked(model_index); |