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

Unified Diff: android_webview/renderer/print_web_view_helper_linux.cc

Issue 54963005: Upstream printing changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years 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 | « android_webview/renderer/print_web_view_helper_android.cc ('k') | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/renderer/print_web_view_helper_linux.cc
diff --git a/chrome/renderer/printing/print_web_view_helper_linux.cc b/android_webview/renderer/print_web_view_helper_linux.cc
similarity index 95%
copy from chrome/renderer/printing/print_web_view_helper_linux.cc
copy to android_webview/renderer/print_web_view_helper_linux.cc
index 7041acfa2ea5c3139b86b40ebb02b465227b5a39..ba6b0b9624d3ea71446ff7cef1da88ac96eb9325 100644
--- a/chrome/renderer/printing/print_web_view_helper_linux.cc
+++ b/android_webview/renderer/print_web_view_helper_linux.cc
@@ -1,12 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 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 "chrome/renderer/printing/print_web_view_helper.h"
+// TODO(sgurun) copied from chrome/renderer. Remove after crbug.com/322276
+#include "android_webview/renderer/print_web_view_helper.h"
+
+#include "android_webview/common/print_messages.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/common/print_messages.h"
#include "content/public/renderer/render_thread.h"
#include "printing/metafile.h"
#include "printing/metafile_impl.h"
@@ -145,7 +147,7 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
printed_page_params.metafile_data_handle.fd = -1;
}
return true;
-#endif // defined(OS_CHROMEOS)
+#endif // defined(OS_CHROMEOS) || defined(OS_ANDROID)
}
void PrintWebViewHelper::PrintPageInternal(
« no previous file with comments | « android_webview/renderer/print_web_view_helper_android.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698