diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 06:11:00 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 06:11:00 +0000 |
commit | 4d4a6356e8e1a6ac0b177cb6bd398148030cb320 (patch) | |
tree | 9b6856e1e8523dc782c08ae917882250c5ed0503 /webkit/glue/webhistoryitem_impl.h | |
parent | ca8de285102e2df854f56fce3c7163d5a8db7f5a (diff) | |
download | chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.zip chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.tar.gz chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.tar.bz2 |
Re-do r15244: Fix crash in ~TestWebViewDelegate caused by
shell_ being null. Moved the RevokeDragDrop call to the
TestShell destructor instead.
Eliminate webkit/glue/webhistoryitem* in favor of adding a
NavigateBackForwardSoon method WebViewDelegate. This moves
all of the hacky details of how we intercept "history.{back,
forward,go}" into the webkit layer. My eventual plan is to
teach WebCore how to make this not hacky.
BUG=11423
R=mpcomplete
Review URL: http://codereview.chromium.org/108004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webhistoryitem_impl.h')
-rw-r--r-- | webkit/glue/webhistoryitem_impl.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/webkit/glue/webhistoryitem_impl.h b/webkit/glue/webhistoryitem_impl.h deleted file mode 100644 index b28fb91..0000000 --- a/webkit/glue/webhistoryitem_impl.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2006-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. - -#ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ -#define WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ - -#include "webkit/glue/webhistoryitem.h" -#include "googleurl/src/gurl.h" - -#include "RefPtr.h" - -namespace WebCore { - class HistoryItem; -} - -class WebHistoryItemImpl : public WebHistoryItem { - public: - WebHistoryItemImpl(const GURL& url, - const std::wstring& title, - const std::string& history_state, - WebRequest::ExtraData* extra_data); - virtual ~WebHistoryItemImpl(); - - // WebHistoryItem - virtual const GURL& GetURL() const; - virtual const std::wstring& GetTitle() const; - virtual const std::string& GetHistoryState() const; - virtual WebRequest::ExtraData* GetExtraData() const; - - // WebHistoryItemImpl - // Returns a WebCore::HistoryItem based on the history_state. This is - // lazily-created and cached. - WebCore::HistoryItem* GetHistoryItem() const; - - protected: - GURL url_; - std::wstring title_; - std::string history_state_; - mutable RefPtr<WebCore::HistoryItem> history_item_; - scoped_refptr<WebRequest::ExtraData> extra_data_; - - private: - DISALLOW_COPY_AND_ASSIGN(WebHistoryItemImpl); -}; - -#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ |