diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 16:42:25 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 16:42:25 +0000 |
| commit | 807bfceada33743cad3308af48c538d7d7515495 (patch) | |
| tree | 19953eac8d00695cfbb8c00137d8eb192e0aedc7 /chrome/browser/browser.cc | |
| parent | 7b7965f2391594e6a3944ffee8fcdaaf18683fc3 (diff) | |
| download | chromium_src-807bfceada33743cad3308af48c538d7d7515495.zip chromium_src-807bfceada33743cad3308af48c538d7d7515495.tar.gz chromium_src-807bfceada33743cad3308af48c538d7d7515495.tar.bz2 | |
Move more view stuff out of WebContents. This moves context menus and info
bars. I removed the associated functions on TabContents, and have callers call
directly through to the view when the care about mucking with the info bar
(which is busted, IMO).
Review URL: http://codereview.chromium.org/7245
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 2f1e4f3..3f3ebe3 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -40,6 +40,7 @@ #include "chrome/browser/views/status_bubble.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/views/toolbar_star_toggle.h" +#include "chrome/browser/web_contents_view.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" @@ -1538,9 +1539,12 @@ void Browser::RemoveShelvesForTabContents(TabContents* contents) { if (shelf && shelf->GetParent() != NULL) shelf->GetParent()->RemoveChildView(shelf); - ChromeViews::View* info_bar = contents->GetInfoBarView(); - if (info_bar && info_bar->GetParent() != NULL) - info_bar->GetParent()->RemoveChildView(info_bar); + if (contents->AsWebContents()) { + ChromeViews::View* info_bar = + contents->AsWebContents()->view()->GetInfoBarView(); + if (info_bar && info_bar->GetParent() != NULL) + info_bar->GetParent()->RemoveChildView(info_bar); + } } BrowserType::Type Browser::GetType() const { |