| Index: webkit/api/src/BackForwardListClientImpl.h
|
| ===================================================================
|
| --- webkit/api/src/BackForwardListClientImpl.h (revision 30163)
|
| +++ webkit/api/src/BackForwardListClientImpl.h (working copy)
|
| @@ -1,46 +1,72 @@
|
| -// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this
|
| -// source code is governed by a BSD-style license that can be found in the
|
| -// LICENSE file.
|
| +/*
|
| + * Copyright (C) 2009 Google Inc. All rights reserved.
|
| + *
|
| + * Redistribution and use in source and binary forms, with or without
|
| + * modification, are permitted provided that the following conditions are
|
| + * met:
|
| + *
|
| + * * Redistributions of source code must retain the above copyright
|
| + * notice, this list of conditions and the following disclaimer.
|
| + * * Redistributions in binary form must reproduce the above
|
| + * copyright notice, this list of conditions and the following disclaimer
|
| + * in the documentation and/or other materials provided with the
|
| + * distribution.
|
| + * * Neither the name of Google Inc. nor the names of its
|
| + * contributors may be used to endorse or promote products derived from
|
| + * this software without specific prior written permission.
|
| + *
|
| + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + */
|
|
|
| -#ifndef WEBKIT_GLUE_BACK_FORWARD_LIST_CLIENT_IMPL_H_
|
| -#define WEBKIT_GLUE_BACK_FORWARD_LIST_CLIENT_IMPL_H_
|
| +#ifndef BackForwardListClientImpl_h
|
| +#define BackForwardListClientImpl_h
|
|
|
| #include "BackForwardList.h"
|
|
|
| class WebViewImpl;
|
|
|
| -namespace webkit_glue {
|
| +namespace WebKit {
|
|
|
| -extern const char kBackForwardNavigationScheme[];
|
| +extern const char backForwardNavigationScheme[];
|
|
|
| class BackForwardListClientImpl : public WebCore::BackForwardListClient {
|
| - public:
|
| - BackForwardListClientImpl(WebViewImpl* webview);
|
| - ~BackForwardListClientImpl();
|
| +public:
|
| + BackForwardListClientImpl(WebViewImpl* webview);
|
| + ~BackForwardListClientImpl();
|
|
|
| - void SetCurrentHistoryItem(WebCore::HistoryItem* item);
|
| - WebCore::HistoryItem* GetPreviousHistoryItem() const;
|
| + void SetCurrentHistoryItem(WebCore::HistoryItem* item);
|
| + WebCore::HistoryItem* GetPreviousHistoryItem() const;
|
|
|
| - private:
|
| - // WebCore::BackForwardListClient methods:
|
| - virtual void addItem(PassRefPtr<WebCore::HistoryItem> item);
|
| - virtual void goToItem(WebCore::HistoryItem* item);
|
| - virtual WebCore::HistoryItem* currentItem();
|
| - virtual WebCore::HistoryItem* itemAtIndex(int index);
|
| - virtual int backListCount();
|
| - virtual int forwardListCount();
|
| - virtual void close();
|
| +private:
|
| + // WebCore::BackForwardListClient methods:
|
| + virtual void addItem(PassRefPtr<WebCore::HistoryItem>);
|
| + virtual void goToItem(WebCore::HistoryItem*);
|
| + virtual WebCore::HistoryItem* currentItem();
|
| + virtual WebCore::HistoryItem* itemAtIndex(int index);
|
| + virtual int backListCount();
|
| + virtual int forwardListCount();
|
| + virtual void close();
|
|
|
| - WebViewImpl* webview_;
|
| + WebViewImpl* m_webView;
|
|
|
| - RefPtr<WebCore::HistoryItem> previous_item_;
|
| - RefPtr<WebCore::HistoryItem> current_item_;
|
| + RefPtr<WebCore::HistoryItem> m_previousItem;
|
| + RefPtr<WebCore::HistoryItem> m_currentItem;
|
|
|
| - // The last history item that was accessed via itemAtIndex(). We keep track
|
| - // of this until goToItem() is called, so we can track the navigation.
|
| - RefPtr<WebCore::HistoryItem> pending_history_item_;
|
| + // The last history item that was accessed via itemAtIndex(). We keep track
|
| + // of this until goToItem() is called, so we can track the navigation.
|
| + RefPtr<WebCore::HistoryItem> m_pendingHistoryItem;
|
| };
|
|
|
| -} // namespace webkit_glue
|
| +} // namespace WebKit
|
|
|
| -#endif // WEBKIT_GLUE_BACK_FORWARD_LIST_CLIENT_IMPL_H_
|
| +#endif
|
|
|