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

Unified Diff: content/browser/transition_request_manager.cc

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: rebase Created 6 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
« no previous file with comments | « content/browser/transition_request_manager.h ('k') | content/browser/web_contents/web_contents_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/transition_request_manager.cc
diff --git a/content/browser/transition_request_manager.cc b/content/browser/transition_request_manager.cc
index b863991c7195c16003fb94706a49abd682806818..e3f4317695f0b61493fe395f3838bfa743dc0dcf 100644
--- a/content/browser/transition_request_manager.cc
+++ b/content/browser/transition_request_manager.cc
@@ -86,13 +86,11 @@ TransitionRequestManager::TransitionRequestData::AllowedEntry::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)
: allowed_destination_host_pattern(allowed_destination_host_pattern),
css_selector(css_selector),
markup(markup),
- names(names),
- rects(rects) {
+ elements(elements) {
}
TransitionRequestManager::TransitionRequestData::AllowedEntry::~AllowedEntry() {
@@ -129,13 +127,11 @@ void TransitionRequestManager::TransitionRequestData::AddEntry(
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) {
allowed_entries_.push_back(AllowedEntry(allowed_destination_host_pattern,
css_selector,
markup,
- names,
- rects));
+ elements));
}
bool TransitionRequestManager::TransitionRequestData::FindEntry(
@@ -153,12 +149,11 @@ bool TransitionRequestManager::TransitionRequestData::FindEntry(
const AllowedEntry& allowed_entry = allowed_entries_[0];
transition_data->markup = allowed_entry.markup;
transition_data->css_selector = allowed_entry.css_selector;
- transition_data->names = allowed_entry.names;
- transition_data->rects = allowed_entry.rects;
+ transition_data->elements = allowed_entry.elements;
return true;
}
-bool TransitionRequestManager::HasPendingTransitionRequest(
+bool TransitionRequestManager::GetPendingTransitionRequest(
int render_process_id,
int render_frame_id,
const GURL& request_url,
@@ -178,13 +173,12 @@ void TransitionRequestManager::AddPendingTransitionRequestData(
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) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
std::pair<int, int> key(render_process_id, render_frame_id);
pending_transition_frames_[key].AddEntry(
- allowed_destination_host_pattern, css_selector, markup, names, rects);
+ allowed_destination_host_pattern, css_selector, markup, elements);
}
void TransitionRequestManager::AddPendingTransitionRequestDataForTesting(
@@ -197,8 +191,7 @@ void TransitionRequestManager::AddPendingTransitionRequestDataForTesting(
"*", /* allowed_destination_host_pattern */
"", /* css_selector */
"", /* markup */
- std::vector<std::string>(), /* names */
- std::vector<gfx::Rect>()); /* rects */
+ std::vector<TransitionElement>()); /* elements */
}
void TransitionRequestManager::ClearPendingTransitionRequestData(
« no previous file with comments | « content/browser/transition_request_manager.h ('k') | content/browser/web_contents/web_contents_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698