Introduce content::PageState (again).

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 199 matching lines @@
     params->current_history_list_offset =
         controller.GetLastCommittedEntryIndex();
     params->current_history_list_length = controller.GetEntryCount();
   }
   if (!entry.GetBaseURLForDataURL().is_empty()) {
     params->base_url_for_data_url = entry.GetBaseURLForDataURL();
     params->history_url_for_data_url = entry.GetVirtualURL();
   }
   params->referrer = entry.GetReferrer();
   params->transition = entry.GetTransitionType();
-  params->state = entry.GetContentState();
+  params->page_state = entry.GetPageState();
   params->navigation_type =
       GetNavigationType(controller.GetBrowserContext(), entry, reload_type);
   params->request_time = base::Time::Now();
   params->extra_headers = entry.extra_headers();
   params->transferred_request_child_id =
       entry.transferred_global_request_id().child_id;
   params->transferred_request_request_id =
       entry.transferred_global_request_id().request_id;
   params->is_overriding_user_agent = entry.GetIsOverridingUserAgent();
   // Avoid downloading when in view-source mode.
@@ skipping 1747 matching lines @@
     return;
 
   NavigationEntry* active_entry = GetController().GetActiveEntry();
   if (!active_entry)
     return;
 
   delegate_->ViewSourceForTab(this, active_entry->GetURL());
 }
 
 void WebContentsImpl::ViewFrameSource(const GURL& url,
-                                      const std::string& content_state) {
+                                      const PageState& page_state) {
   if (!delegate_)
     return;
 
-  delegate_->ViewSourceForFrame(this, url, content_state);
+  delegate_->ViewSourceForFrame(this, url, page_state);
 }
 
 int WebContentsImpl::GetMinimumZoomPercent() const {
   return minimum_zoom_percent_;
 }
 
 int WebContentsImpl::GetMaximumZoomPercent() const {
   return maximum_zoom_percent_;
 }
 
@@ skipping 892 matching lines @@
     if (delegate_) {
       delegate_->DidNavigateMainFramePostCommit(this);
       view_->SetOverscrollControllerEnabled(delegate_->CanOverscrollContent());
     }
   }
   DidNavigateAnyFramePostCommit(rvh, details, params);
 }
 
 void WebContentsImpl::UpdateState(RenderViewHost* rvh,
                                   int32 page_id,
-                                  const std::string& state) {
+                                  const PageState& page_state) {
   // Ensure that this state update comes from either the active RVH or one of
   // the swapped out RVHs.  We don't expect to hear from any other RVHs.
   DCHECK(rvh == GetRenderViewHost() || render_manager_.IsOnSwappedOutList(rvh));
 
   // We must be prepared to handle state updates for any page, these occur
   // when the user is scrolling and entering form data, as well as when we're
   // leaving a page, in which case our state may have already been moved to
   // the next page. The navigation controller will look up the appropriate
   // NavigationEntry and update it when it is notified via the delegate.
 
   int entry_index = controller_.GetEntryIndexWithPageID(
       rvh->GetSiteInstance(), page_id);
   if (entry_index < 0)
     return;
   NavigationEntry* entry = controller_.GetEntryAtIndex(entry_index);
 
-  if (state == entry->GetContentState())
+  if (page_state == entry->GetPageState())
     return;  // Nothing to update.
-  entry->SetContentState(state);
+  entry->SetPageState(page_state);
   controller_.NotifyEntryChanged(entry, entry_index);
 }
 
 void WebContentsImpl::UpdateTitle(RenderViewHost* rvh,
                                   int32 page_id,
                                   const string16& title,
                                   base::i18n::TextDirection title_direction) {
   // If we have a title, that's a pretty good indication that we've started
   // getting useful data.
   SetNotWaitingForResponse();
@@ skipping 640 matching lines @@
 }
 
 BrowserPluginGuestManager*
     WebContentsImpl::GetBrowserPluginGuestManager() const {
   return static_cast<BrowserPluginGuestManager*>(
       GetBrowserContext()->GetUserData(
           browser_plugin::kBrowserPluginGuestManagerKeyName));
 }
 
 }  // namespace content