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/views/old_frames/vista_frame.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/views/old_frames/vista_frame.cc')
| -rw-r--r-- | chrome/browser/views/old_frames/vista_frame.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/views/old_frames/vista_frame.cc b/chrome/browser/views/old_frames/vista_frame.cc index 3c25943..592237a 100644 --- a/chrome/browser/views/old_frames/vista_frame.cc +++ b/chrome/browser/views/old_frames/vista_frame.cc @@ -26,6 +26,8 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/browser/views/tabs/tab_strip.h" +#include "chrome/browser/web_contents.h" +#include "chrome/browser/web_contents_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" @@ -1616,8 +1618,9 @@ void VistaFrame::ShelfVisibilityChangedImpl(TabContents* current_tab) { changed |= UpdateChildViewAndLayout(new_shelf, &shelf_view_); ChromeViews::View* new_info_bar = NULL; - if (current_tab && current_tab->IsInfoBarVisible()) - new_info_bar = current_tab->GetInfoBarView(); + WebContents* web_contents = current_tab ? current_tab->AsWebContents() : NULL; + if (web_contents && web_contents->view()->IsInfoBarVisible()) + new_info_bar = web_contents->view()->GetInfoBarView(); changed |= UpdateChildViewAndLayout(new_info_bar, &info_bar_view_); ChromeViews::View* new_bookmark_bar_view = NULL; |