| Index: Source/core/page/DOMWindow.h
|
| diff --git a/Source/core/page/DOMWindow.h b/Source/core/page/DOMWindow.h
|
| index 206e46cfd91cb08e0342afdfb3038510e91a2e20..18b241345bc95f9bdef30e7110bdb1b9b3c003c3 100644
|
| --- a/Source/core/page/DOMWindow.h
|
| +++ b/Source/core/page/DOMWindow.h
|
| @@ -34,8 +34,7 @@
|
| #include "core/platform/Supplementable.h"
|
|
|
| namespace WebCore {
|
| -
|
| - class BarInfo;
|
| + class BarProp;
|
| class CSSRuleList;
|
| class CSSStyleDeclaration;
|
| class Console;
|
| @@ -129,12 +128,12 @@ namespace WebCore {
|
| Screen* screen() const;
|
| History* history() const;
|
| Crypto* crypto() const;
|
| - BarInfo* locationbar() const;
|
| - BarInfo* menubar() const;
|
| - BarInfo* personalbar() const;
|
| - BarInfo* scrollbars() const;
|
| - BarInfo* statusbar() const;
|
| - BarInfo* toolbar() const;
|
| + BarProp* locationbar() const;
|
| + BarProp* menubar() const;
|
| + BarProp* personalbar() const;
|
| + BarProp* scrollbars() const;
|
| + BarProp* statusbar() const;
|
| + BarProp* toolbar() const;
|
| Navigator* navigator() const;
|
| Navigator* clientInformation() const { return navigator(); }
|
|
|
| @@ -411,12 +410,12 @@ namespace WebCore {
|
| mutable RefPtr<Screen> m_screen;
|
| mutable RefPtr<History> m_history;
|
| mutable RefPtr<Crypto> m_crypto;
|
| - mutable RefPtr<BarInfo> m_locationbar;
|
| - mutable RefPtr<BarInfo> m_menubar;
|
| - mutable RefPtr<BarInfo> m_personalbar;
|
| - mutable RefPtr<BarInfo> m_scrollbars;
|
| - mutable RefPtr<BarInfo> m_statusbar;
|
| - mutable RefPtr<BarInfo> m_toolbar;
|
| + mutable RefPtr<BarProp> m_locationbar;
|
| + mutable RefPtr<BarProp> m_menubar;
|
| + mutable RefPtr<BarProp> m_personalbar;
|
| + mutable RefPtr<BarProp> m_scrollbars;
|
| + mutable RefPtr<BarProp> m_statusbar;
|
| + mutable RefPtr<BarProp> m_toolbar;
|
| mutable RefPtr<Console> m_console;
|
| mutable RefPtr<Navigator> m_navigator;
|
| mutable RefPtr<Location> m_location;
|
|
|