Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1778)

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 2934004: Try to cut down Browser/TabContents header dependencies. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: fix unit tests compile Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/browser/tab_contents/test_tab_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index fa17e794933195fc5b7c729c891c5502c680c0ad..f0dd1d5386882d032107508f2b6cf644dabea9e2 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -53,6 +53,7 @@
#include "chrome/browser/platform_util.h"
#include "chrome/browser/plugin_installer.h"
#include "chrome/browser/pref_service.h"
+#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -77,6 +78,9 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_action.h"
#include "chrome/common/extensions/extension_resource.h"
+#include "chrome/common/extensions/url_pattern.h"
+#include "chrome/common/navigation_types.h"
+#include "chrome/common/net/url_request_context_getter.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
@@ -248,7 +252,8 @@ TabContents::TabContents(Profile* profile,
ALLOW_THIS_IN_INITIALIZER_LIST(render_manager_(this, this)),
property_bag_(),
registrar_(),
- ALLOW_THIS_IN_INITIALIZER_LIST(printing_(*this)),
+ ALLOW_THIS_IN_INITIALIZER_LIST(printing_(
+ new printing::PrintViewManager(*this))),
save_package_(),
autocomplete_history_manager_(),
autofill_manager_(),
@@ -827,7 +832,7 @@ bool TabContents::NavigateToPendingEntry(
void TabContents::Stop() {
render_manager_.Stop();
- printing_.Stop();
+ printing_->Stop();
}
void TabContents::DisassociateFromPopupCount() {
@@ -2143,7 +2148,7 @@ RenderViewHostDelegate::Save* TabContents::GetSaveDelegate() {
}
RenderViewHostDelegate::Printing* TabContents::GetPrintingDelegate() {
- return &printing_;
+ return printing_.get();
}
RenderViewHostDelegate::FavIcon* TabContents::GetFavIconDelegate() {
@@ -2237,7 +2242,7 @@ void TabContents::RenderViewReady(RenderViewHost* rvh) {
void TabContents::RenderViewGone(RenderViewHost* rvh) {
// Ask the print preview if this renderer was valuable.
- if (!printing_.OnRenderViewGone(rvh))
+ if (!printing_->OnRenderViewGone(rvh))
return;
if (rvh != render_view_host()) {
// The pending page's RenderViewHost is gone.
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/browser/tab_contents/test_tab_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698