summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_commands.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/browser_commands.cc')
-rw-r--r--chrome/browser/ui/browser_commands.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index fd1c0ad..4000083 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -73,6 +73,7 @@
#include "content/public/common/url_utils.h"
#include "net/base/escape.h"
#include "webkit/common/user_agent/user_agent_util.h"
+#include "webkit/glue/glue_serialize.h"
#if defined(OS_MACOSX)
#include "ui/base/cocoa/find_pasteboard.h"
@@ -995,13 +996,13 @@ void ViewSource(Browser* browser, WebContents* contents) {
if (!entry)
return;
- ViewSource(browser, contents, entry->GetURL(), entry->GetPageState());
+ ViewSource(browser, contents, entry->GetURL(), entry->GetContentState());
}
void ViewSource(Browser* browser,
WebContents* contents,
const GURL& url,
- const content::PageState& page_state) {
+ const std::string& content_state) {
content::RecordAction(UserMetricsAction("ViewSource"));
DCHECK(contents);
@@ -1019,7 +1020,8 @@ void ViewSource(Browser* browser,
active_entry->SetVirtualURL(view_source_url);
// Do not restore scroller position.
- active_entry->SetPageState(page_state.RemoveScrollOffset());
+ active_entry->SetContentState(
+ webkit_glue::RemoveScrollOffsetFromHistoryState(content_state));
// Do not restore title, derive it from the url.
active_entry->SetTitle(string16());