| Index: webkit/api/src/BackForwardListClientImpl.cpp
|
| ===================================================================
|
| --- webkit/api/src/BackForwardListClientImpl.cpp (revision 30557)
|
| +++ webkit/api/src/BackForwardListClientImpl.cpp (working copy)
|
| @@ -33,10 +33,8 @@
|
|
|
| #include "HistoryItem.h"
|
| #include "WebViewClient.h"
|
| +#include "WebViewImpl.h"
|
|
|
| -// FIXME: Remove this once WebViewImpl moves out of glue/.
|
| -#include "webkit/glue/webview_impl.h"
|
| -
|
| using namespace WebCore;
|
|
|
| namespace WebKit {
|
| @@ -52,13 +50,13 @@
|
| {
|
| }
|
|
|
| -void BackForwardListClientImpl::SetCurrentHistoryItem(HistoryItem* item)
|
| +void BackForwardListClientImpl::setCurrentHistoryItem(HistoryItem* item)
|
| {
|
| m_previousItem = m_currentItem;
|
| m_currentItem = item;
|
| }
|
|
|
| -HistoryItem* BackForwardListClientImpl::GetPreviousHistoryItem() const
|
| +HistoryItem* BackForwardListClientImpl::previousHistoryItem() const
|
| {
|
| return m_previousItem.get();
|
| }
|
| @@ -70,7 +68,7 @@
|
|
|
| // If WebCore adds a new HistoryItem, it means this is a new navigation (ie,
|
| // not a reload or back/forward).
|
| - m_webView->ObserveNewNavigation();
|
| + m_webView->observeNewNavigation();
|
|
|
| if (m_webView->client())
|
| m_webView->client()->didAddHistoryItem();
|
|
|