diff options
Diffstat (limited to 'chrome/browser/views/old_frames')
| -rw-r--r-- | chrome/browser/views/old_frames/vista_frame.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/views/old_frames/xp_frame.cc | 7 |
2 files changed, 10 insertions, 4 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; diff --git a/chrome/browser/views/old_frames/xp_frame.cc b/chrome/browser/views/old_frames/xp_frame.cc index cb0220c..5672ec2 100644 --- a/chrome/browser/views/old_frames/xp_frame.cc +++ b/chrome/browser/views/old_frames/xp_frame.cc @@ -23,6 +23,8 @@ #include "chrome/browser/views/old_frames/point_buffer.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/chrome_switches.h" #include "chrome/common/gfx/chrome_canvas.h" @@ -2494,8 +2496,9 @@ void XPFrame::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; |