diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 19:20:48 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 19:20:48 +0000 |
commit | 36ad4aa827aa4e1f442e45efaea6b7b74dce5f0c (patch) | |
tree | 27247c4a5fae1357f31e5c70d160881a5eeb5e38 /chrome/browser/ui/gtk/browser_window_gtk.cc | |
parent | 24e4e63bb6291440dbeeed5fec4dfd6d7d5a9a28 (diff) | |
download | chromium_src-36ad4aa827aa4e1f442e45efaea6b7b74dce5f0c.zip chromium_src-36ad4aa827aa4e1f442e45efaea6b7b74dce5f0c.tar.gz chromium_src-36ad4aa827aa4e1f442e45efaea6b7b74dce5f0c.tar.bz2 |
Remove TabContents from BrowserWindow and website settings.
BUG=107201
TEST=no visible change
Review URL: https://chromiumcodereview.appspot.com/11413102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 17484e5..422112f 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -886,10 +886,10 @@ void BrowserWindowGtk::UpdateReloadStopState(bool is_loading, bool force) { force); } -void BrowserWindowGtk::UpdateToolbar(TabContents* contents, +void BrowserWindowGtk::UpdateToolbar(content::WebContents* contents, bool should_restore_state) { TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::UpdateToolbar"); - toolbar_->UpdateWebContents(contents->web_contents(), should_restore_state); + toolbar_->UpdateWebContents(contents, should_restore_state); } void BrowserWindowGtk::FocusToolbar() { @@ -1014,12 +1014,12 @@ void BrowserWindowGtk::ShowPageInfo(content::WebContents* web_contents, void BrowserWindowGtk::ShowWebsiteSettings( Profile* profile, - TabContents* tab_contents, + content::WebContents* web_contents, const GURL& url, const content::SSLStatus& ssl, bool show_history) { WebsiteSettingsPopupGtk::Show(GetNativeWindow(), profile, - tab_contents, url, ssl); + web_contents, url, ssl); } void BrowserWindowGtk::ShowAppMenu() { |