Index: Source/core/page/DOMWindow.cpp |
diff --git a/Source/core/page/DOMWindow.cpp b/Source/core/page/DOMWindow.cpp |
index 71e4b547cd8b4c8db57b21b6d6efff447eb2bc76..9e7b2a8efec457ef554685549efaca3faeda4d3a 100644 |
--- a/Source/core/page/DOMWindow.cpp |
+++ b/Source/core/page/DOMWindow.cpp |
@@ -71,7 +71,7 @@ |
#include "core/loader/FrameLoader.h" |
#include "core/loader/FrameLoaderClient.h" |
#include "core/loader/appcache/DOMApplicationCache.h" |
-#include "core/page/BarInfo.h" |
+#include "core/page/BarProp.h" |
#include "core/page/Chrome.h" |
#include "core/page/ChromeClient.h" |
#include "core/page/Console.h" |
@@ -573,57 +573,57 @@ Crypto* DOMWindow::crypto() const |
return m_crypto.get(); |
} |
-BarInfo* DOMWindow::locationbar() const |
+BarProp* DOMWindow::locationbar() const |
{ |
if (!isCurrentlyDisplayedInFrame()) |
return 0; |
if (!m_locationbar) |
- m_locationbar = BarInfo::create(m_frame, BarInfo::Locationbar); |
+ m_locationbar = BarProp::create(m_frame, BarProp::Locationbar); |
return m_locationbar.get(); |
} |
-BarInfo* DOMWindow::menubar() const |
+BarProp* DOMWindow::menubar() const |
{ |
if (!isCurrentlyDisplayedInFrame()) |
return 0; |
if (!m_menubar) |
- m_menubar = BarInfo::create(m_frame, BarInfo::Menubar); |
+ m_menubar = BarProp::create(m_frame, BarProp::Menubar); |
return m_menubar.get(); |
} |
-BarInfo* DOMWindow::personalbar() const |
+BarProp* DOMWindow::personalbar() const |
{ |
if (!isCurrentlyDisplayedInFrame()) |
return 0; |
if (!m_personalbar) |
- m_personalbar = BarInfo::create(m_frame, BarInfo::Personalbar); |
+ m_personalbar = BarProp::create(m_frame, BarProp::Personalbar); |
return m_personalbar.get(); |
} |
-BarInfo* DOMWindow::scrollbars() const |
+BarProp* DOMWindow::scrollbars() const |
{ |
if (!isCurrentlyDisplayedInFrame()) |
return 0; |
if (!m_scrollbars) |
- m_scrollbars = BarInfo::create(m_frame, BarInfo::Scrollbars); |
+ m_scrollbars = BarProp::create(m_frame, BarProp::Scrollbars); |
return m_scrollbars.get(); |
} |
-BarInfo* DOMWindow::statusbar() const |
+BarProp* DOMWindow::statusbar() const |
{ |
if (!isCurrentlyDisplayedInFrame()) |
return 0; |
if (!m_statusbar) |
- m_statusbar = BarInfo::create(m_frame, BarInfo::Statusbar); |
+ m_statusbar = BarProp::create(m_frame, BarProp::Statusbar); |
return m_statusbar.get(); |
} |
-BarInfo* DOMWindow::toolbar() const |
+BarProp* DOMWindow::toolbar() const |
{ |
if (!isCurrentlyDisplayedInFrame()) |
return 0; |
if (!m_toolbar) |
- m_toolbar = BarInfo::create(m_frame, BarInfo::Toolbar); |
+ m_toolbar = BarProp::create(m_frame, BarProp::Toolbar); |
return m_toolbar.get(); |
} |