Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/ui/webui/cloud_print_signin_dialog.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/webui/cloud_print_signin_dialog.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 using content::BrowserThread;
 using content::NavigationEntry;
 using content::WebContents;
@@ skipping 24 matching lines @@
   content::NotificationRegistrar registrar_;
   WebContents* parent_tab_;
 };
 
 CloudPrintSigninFlowHandler::CloudPrintSigninFlowHandler(
     WebContents* parent_tab) : parent_tab_(parent_tab) {
 }
 
 void CloudPrintSigninFlowHandler::RegisterMessages() {
   if (web_ui() && web_ui()->web_contents()) {
-    NavigationController* controller =
+    content::NavigationController* controller =
         &web_ui()->web_contents()->GetController();
     NavigationEntry* pending_entry = controller->GetPendingEntry();
     if (pending_entry)
       pending_entry->SetURL(CloudPrintURL(
           Profile::FromWebUI(web_ui())).GetCloudPrintSigninURL());
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                    content::Source<content::NavigationController>(controller));
   }
 }
 
@@ skipping 116 matching lines @@
 }
 
 void CreateCloudPrintSigninDialog(WebContents* parent_tab) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CreateCloudPrintSigninDialogImpl, parent_tab));
 }
 }  // namespace cloud_print_signin_dialog