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

Unified Diff: content/browser/transition_request_manager.h

Issue 652283002: Navigation transitions (web to native app): Get names and rects of transition elements (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use struct as IPC params Created 6 years, 2 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: content/browser/transition_request_manager.h
diff --git a/content/browser/transition_request_manager.h b/content/browser/transition_request_manager.h
index 0a01878eb1a5f6d3f7a0e3bbacaf8ae3216bce3f..a610896a6b7c772ca34fe55fc0c8624658fa3542 100644
--- a/content/browser/transition_request_manager.h
+++ b/content/browser/transition_request_manager.h
@@ -13,6 +13,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
+#include "ui/gfx/geometry/rect.h"
#include "url/gurl.h"
template <typename T>
@@ -32,6 +33,8 @@ struct TransitionLayerData {
std::string markup;
std::string css_selector;
+ std::vector<std::string> names;
+ std::vector<gfx::Rect> rects;
scoped_refptr<net::HttpResponseHeaders> response_headers;
GURL request_url;
};
@@ -69,7 +72,12 @@ class TransitionRequestManager {
int render_frame_id,
const std::string& allowed_destination_host_pattern,
const std::string& css_selector,
- const std::string& markup);
+ const std::string& markup,
+ const std::vector<std::string>& names,
+ const std::vector<gfx::Rect>& rects);
+ CONTENT_EXPORT void AddPendingTransitionRequestDataForTesting(
+ int render_process_id,
+ int render_frame_id);
void ClearPendingTransitionRequestData(int render_process_id,
int render_frame_id);
@@ -81,7 +89,9 @@ class TransitionRequestManager {
~TransitionRequestData();
void AddEntry(const std::string& allowed_destination_host_pattern,
const std::string& selector,
- const std::string& markup);
+ const std::string& markup,
+ const std::vector<std::string>& names,
+ const std::vector<gfx::Rect>& rects);
bool FindEntry(const GURL& request_url,
TransitionLayerData* transition_data);
@@ -93,13 +103,15 @@ class TransitionRequestManager {
std::string allowed_destination_host_pattern;
std::string css_selector;
std::string markup;
+ std::vector<std::string> names;
+ std::vector<gfx::Rect> rects;
AllowedEntry(const std::string& allowed_destination_host_pattern,
const std::string& css_selector,
- const std::string& markup) :
- allowed_destination_host_pattern(allowed_destination_host_pattern),
- css_selector(css_selector),
- markup(markup) {}
+ const std::string& markup,
+ const std::vector<std::string>& names,
+ const std::vector<gfx::Rect>& rects);
+ ~AllowedEntry();
nasko 2014/10/17 20:04:19 If there is a destructor, this is no longer a simp
Zhen Wang 2014/10/17 21:34:29 It will complain without the destructor. http://w
nasko 2014/10/20 14:14:18 Acknowledged.
};
std::vector<AllowedEntry> allowed_entries_;
};

Powered by Google App Engine
This is Rietveld 408576698