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

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

Issue 137833002: Fix an out-of-date issue in chrome.webNavigation document. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update doc Created 6 years, 11 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: chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
index fe11eeffc96f3d15eb54e7d0709a26a06c8416c2..77f1a44a4d48bcd0239de47f1319eb5f4c80564c 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
@@ -18,6 +18,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/page_transition_types.h"
#include "extensions/browser/event_router.h"
#include "extensions/common/event_filtering_info.h"
#include "net/base/net_errors.h"
@@ -99,9 +100,14 @@ void DispatchOnCommitted(const std::string& event_name,
dict->SetInteger(keys::kProcessIdKey,
web_contents->GetRenderViewHost()->GetProcess()->GetID());
dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id));
- dict->SetString(
- keys::kTransitionTypeKey,
- content::PageTransitionGetCoreTransitionString(transition_type));
+ std::string transition_type_string =
+ content::PageTransitionGetCoreTransitionString(transition_type);
+ // For webNavigation API backward compatibility, keep "start_page" even after
+ // renamed to "auto_toplevel".
+ if (PageTransitionStripQualifier(transition_type) ==
+ content::PAGE_TRANSITION_AUTO_TOPLEVEL)
+ transition_type_string = "start_page";
+ dict->SetString(keys::kTransitionTypeKey, transition_type_string);
base::ListValue* qualifiers = new base::ListValue();
if (transition_type & content::PAGE_TRANSITION_CLIENT_REDIRECT)
qualifiers->Append(new base::StringValue("client_redirect"));
« no previous file with comments | « no previous file | chrome/common/extensions/api/web_navigation.json » ('j') | chrome/common/extensions/api/web_navigation.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698