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

Unified Diff: content/browser/transition_request_manager.h

Issue 652953008: Navigation transitions (web to native app): Pass data after starting provisional load (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use struct for name+rect 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 a610896a6b7c772ca34fe55fc0c8624658fa3542..4e0e34e3befbeb3be2cd01b86e49ffc0289b697b 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 "content/public/common/transition_element.h"
#include "ui/gfx/geometry/rect.h"
#include "url/gurl.h"
@@ -33,8 +34,7 @@ struct TransitionLayerData {
std::string markup;
std::string css_selector;
- std::vector<std::string> names;
- std::vector<gfx::Rect> rects;
+ std::vector<TransitionElement> elements;
scoped_refptr<net::HttpResponseHeaders> response_headers;
GURL request_url;
};
@@ -73,8 +73,7 @@ class TransitionRequestManager {
const std::string& allowed_destination_host_pattern,
const std::string& css_selector,
const std::string& markup,
- const std::vector<std::string>& names,
- const std::vector<gfx::Rect>& rects);
+ const std::vector<TransitionElement>& elements);
CONTENT_EXPORT void AddPendingTransitionRequestDataForTesting(
int render_process_id,
int render_frame_id);
@@ -90,8 +89,7 @@ class TransitionRequestManager {
void AddEntry(const std::string& allowed_destination_host_pattern,
const std::string& selector,
const std::string& markup,
- const std::vector<std::string>& names,
- const std::vector<gfx::Rect>& rects);
+ const std::vector<TransitionElement>& elements);
bool FindEntry(const GURL& request_url,
TransitionLayerData* transition_data);
@@ -103,14 +101,12 @@ 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;
+ std::vector<TransitionElement> elements;
AllowedEntry(const std::string& allowed_destination_host_pattern,
const std::string& css_selector,
const std::string& markup,
- const std::vector<std::string>& names,
- const std::vector<gfx::Rect>& rects);
+ const std::vector<TransitionElement>& elements);
~AllowedEntry();
};
std::vector<AllowedEntry> allowed_entries_;

Powered by Google App Engine
This is Rietveld 408576698