Revert 253010 "Revert 251563 "Move browser initiated navigation ..."

trunk/src/content/browser/frame_host/navigator_impl.cc

 // Copyright 2013 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/frame_host/navigator_impl.h"
 
 #include "base/command_line.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
@@ skipping 14 matching lines @@
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 
 namespace content {
 
 namespace {
 
-ViewMsg_Navigate_Type::Value GetNavigationType(
+FrameMsg_Navigate_Type::Value GetNavigationType(
     BrowserContext* browser_context, const NavigationEntryImpl& entry,
     NavigationController::ReloadType reload_type) {
   switch (reload_type) {
     case NavigationControllerImpl::RELOAD:
-      return ViewMsg_Navigate_Type::RELOAD;
+      return FrameMsg_Navigate_Type::RELOAD;
     case NavigationControllerImpl::RELOAD_IGNORING_CACHE:
-      return ViewMsg_Navigate_Type::RELOAD_IGNORING_CACHE;
+      return FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE;
     case NavigationControllerImpl::RELOAD_ORIGINAL_REQUEST_URL:
-      return ViewMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL;
+      return FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL;
     case NavigationControllerImpl::NO_RELOAD:
       break;  // Fall through to rest of function.
   }
 
   // |RenderViewImpl::PopulateStateFromPendingNavigationParams| differentiates
   // between |RESTORE_WITH_POST| and |RESTORE|.
   if (entry.restore_type() ==
       NavigationEntryImpl::RESTORE_LAST_SESSION_EXITED_CLEANLY) {
     if (entry.GetHasPostData())
-      return ViewMsg_Navigate_Type::RESTORE_WITH_POST;
-    return ViewMsg_Navigate_Type::RESTORE;
+      return FrameMsg_Navigate_Type::RESTORE_WITH_POST;
+    return FrameMsg_Navigate_Type::RESTORE;
   }
 
-  return ViewMsg_Navigate_Type::NORMAL;
+  return FrameMsg_Navigate_Type::NORMAL;
 }
 
 void MakeNavigateParams(const NavigationEntryImpl& entry,
                         const NavigationControllerImpl& controller,
                         NavigationController::ReloadType reload_type,
-                        ViewMsg_Navigate_Params* params) {
+                        FrameMsg_Navigate_Params* params) {
   params->page_id = entry.GetPageID();
   params->should_clear_history_list = entry.should_clear_history_list();
   params->should_replace_current_entry = entry.should_replace_entry();
   if (entry.should_clear_history_list()) {
     // Set the history list related parameters to the same values a
     // NavigationController would return before its first navigation. This will
     // fully clear the RenderView's view of the session history.
     params->pending_history_list_offset = -1;
     params->current_history_list_offset = -1;
     params->current_history_list_length = 0;
@@ skipping 250 matching lines @@
     CHECK(0);
   }
 
   // Notify observers that we will navigate in this RenderFrame.
   if (delegate_)
     delegate_->AboutToNavigateRenderFrame(dest_render_frame_host);
 
   // Used for page load time metrics.
   current_load_start_ = base::TimeTicks::Now();
 
-  // Navigate in the desired RenderViewHost.
+  // Navigate in the desired RenderFrameHost.
   // TODO(creis): As a temporary hack, we currently do cross-process subframe
   // navigations in a top-level frame of the new process.  Thus, we don't yet
-  // need to store the correct frame ID in ViewMsg_Navigate_Params.
-  ViewMsg_Navigate_Params navigate_params;
+  // need to store the correct frame ID in FrameMsg_Navigate_Params.
+  FrameMsg_Navigate_Params navigate_params;
   MakeNavigateParams(entry, *controller_, reload_type, &navigate_params);
-  dest_render_frame_host->render_view_host()->Navigate(navigate_params);
+  dest_render_frame_host->Navigate(navigate_params);
 
   if (entry.GetPageID() == -1) {
     // HACK!!  This code suppresses javascript: URLs from being added to
     // session history, which is what we want to do for javascript: URLs that
     // do not generate content.  What we really need is a message from the
     // renderer telling us that a new page was not created.  The same message
     // could be used for mailto: URLs and the like.
     if (entry.GetURL().SchemeIs(kJavaScriptScheme))
       return false;
   }
@@ skipping 168 matching lines @@
   // still be used for a normal web site.
   if (url == GURL(kAboutBlankURL))
     return false;
 
   // The embedder will then have the opportunity to determine if the URL
   // should "use up" the SiteInstance.
   return GetContentClient()->browser()->ShouldAssignSiteForURL(url);
 }
 
 }  // namespace content