diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 00:46:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 00:46:20 +0000 |
| commit | cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323 (patch) | |
| tree | 4a9218cc8e53e78e565140e5e88d85c29280117e /chrome/browser/printing | |
| parent | 46a7e02c5bba1b9c68f86befaf586d0b17eb0b04 (diff) | |
| download | chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.zip chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.tar.gz chromium_src-cdcb1dee07b6c8e7fe968b2a5f4199c9c8fb2323.tar.bz2 | |
Convert WebContents to return a content::NavigationController instead of the implementation. Update all the headers in chrome to use the interface only. In a subsequent cl, I'll rename the implementation to NavigationControllerImpl and also get rid of content::NavigationController everywhere.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8983010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/print_dialog_cloud.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/printing/print_preview_tab_controller.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index afa4c16..bdb3ad3 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -28,10 +28,10 @@ #include "chrome/common/print_messages.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/browser/webui/web_ui.h" #include "content/public/browser/browser_thread.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" @@ -303,7 +303,8 @@ void CloudPrintFlowHandler::RegisterMessages() { // Register for appropriate notifications, and re-direct the URL // to the real server URL, now that we've gotten an HTML dialog // going. - NavigationController* controller = &web_ui()->web_contents()->GetController(); + content::NavigationController* controller = + &web_ui()->web_contents()->GetController(); NavigationEntry* pending_entry = controller->GetPendingEntry(); if (pending_entry) { Profile* profile = Profile::FromWebUI(web_ui()); diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc index 16143e4..3b2bfad 100644 --- a/chrome/browser/printing/print_preview_tab_controller.cc +++ b/chrome/browser/printing/print_preview_tab_controller.cc @@ -30,8 +30,8 @@ #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" -#include "content/browser/tab_contents/navigation_controller.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" |