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

Unified Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 2496203003: Add printing tests to ensure window.print() works for subframes.
Patch Set: Created 4 years, 1 month 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: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 3ad52fe107bc449a92e0ac00d9c0b4ba82cea201..ca50a3167096704c3885cac495adf51a16fab7e3 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -9,8 +9,10 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <set>
#include <string>
+#include <utility>
#include <vector>
#include "base/callback.h"
@@ -132,7 +134,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
int GetFrameTreeNodeId() override;
const std::string& GetFrameName() override;
bool IsCrossProcessSubframe() override;
- const GURL& GetLastCommittedURL() override;
+ const GURL& GetLastCommittedURL() const override;
url::Origin GetLastCommittedOrigin() override;
gfx::NativeView GetNativeView() override;
void AddMessageToConsole(ConsoleMessageLevel level,
@@ -1053,8 +1055,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
// requests should be queued.
bool waiting_for_init_;
- typedef std::pair<CommonNavigationParams, BeginNavigationParams>
- PendingNavigation;
+ using PendingNavigation =
+ std::pair<CommonNavigationParams, BeginNavigationParams>;
std::unique_ptr<PendingNavigation> pendinging_navigate_;
// Callback for responding when

Powered by Google App Engine
This is Rietveld 408576698