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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_distiller.h

Issue 1294663003: Fix various issues from r343263. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: chrome/browser/ui/webui/print_preview/print_preview_distiller.h
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h
index d9ef5dbac3e4bd90967728ed321b97f00bcabb89..8b8a53578a26eb68d473ee21e7b6a07d5599465d 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h
+++ b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h
@@ -5,14 +5,13 @@
#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_DISTILLER_H_
#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_DISTILLER_H_
-#include "base/callback.h"
+#include "base/callback_forward.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
-#include "content/public/browser/web_contents_observer.h"
Lei Zhang 2015/08/14 05:44:35 nit: not used
-namespace net {
-class URLRequestContextGetter;
Lei Zhang 2015/08/14 05:44:35 nit: not used
+namespace content {
+class WebContents;
}
// This class controls the rendering of the distilled contents
@@ -20,27 +19,20 @@ class URLRequestContextGetter;
class PrintPreviewDistiller {
public:
PrintPreviewDistiller(content::WebContents* source_web_contents,
- base::Closure on_failed_callback,
Lei Zhang 2015/08/14 05:44:35 pass callbacks by const ref
+ const base::Closure& on_failed_callback,
scoped_ptr<base::DictionaryValue> settings);
~PrintPreviewDistiller();
private:
class WebContentsDelegateImpl;
- // Create the web contents with a default
- // size. |session_storage_namespace| indicates the namespace that
- // the distiller content renderer's page should be part of.
+ // Create the web contents with a default size.
void CreateDestinationWebContents(
- content::SessionStorageNamespace* session_storage_namespace,
content::WebContents* source_web_contents,
scoped_ptr<base::DictionaryValue> settings,
- base::Closure on_failed_callback);
+ const base::Closure& on_failed_callback);
- content::WebContents* CreateWebContents(
- content::SessionStorageNamespace* session_storage_namespace,
- content::WebContents* source_web_contents);
-
- // The distilled rendered WebContents; may be null.
+ // The WebContents for the distilled rendering; may be null.
scoped_ptr<content::WebContents> web_contents_;
scoped_ptr<WebContentsDelegateImpl> web_contents_delegate_;

Powered by Google App Engine
This is Rietveld 408576698