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

Unified Diff: chrome/browser/extensions/extension_webnavigation_api.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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: chrome/browser/extensions/extension_webnavigation_api.cc
===================================================================
--- chrome/browser/extensions/extension_webnavigation_api.cc (revision 105162)
+++ chrome/browser/extensions/extension_webnavigation_api.cc (working copy)
@@ -94,23 +94,24 @@
int64 frame_id,
bool is_main_frame,
const GURL& url,
- PageTransition::Type transition_type) {
+ content::PageTransition transition_type) {
ListValue args;
DictionaryValue* dict = new DictionaryValue();
dict->SetInteger(keys::kTabIdKey,
ExtensionTabUtil::GetTabId(tab_contents));
dict->SetString(keys::kUrlKey, url.spec());
dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id));
- dict->SetString(keys::kTransitionTypeKey,
- PageTransition::CoreTransitionString(transition_type));
+ dict->SetString(
+ keys::kTransitionTypeKey,
+ content::PageTransitionGetCoreTransitionString(transition_type));
ListValue* qualifiers = new ListValue();
- if (transition_type & PageTransition::CLIENT_REDIRECT)
+ if (transition_type & content::PAGE_TRANSITION_CLIENT_REDIRECT)
qualifiers->Append(Value::CreateStringValue("client_redirect"));
- if (transition_type & PageTransition::SERVER_REDIRECT)
+ if (transition_type & content::PAGE_TRANSITION_SERVER_REDIRECT)
qualifiers->Append(Value::CreateStringValue("server_redirect"));
- if (transition_type & PageTransition::FORWARD_BACK)
+ if (transition_type & content::PAGE_TRANSITION_FORWARD_BACK)
qualifiers->Append(Value::CreateStringValue("forward_back"));
- if (transition_type & PageTransition::FROM_ADDRESS_BAR)
+ if (transition_type & content::PAGE_TRANSITION_FROM_ADDRESS_BAR)
qualifiers->Append(Value::CreateStringValue("from_address_bar"));
dict->Set(keys::kTransitionQualifiersKey, qualifiers);
dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
@@ -509,7 +510,7 @@
int64 frame_id,
bool is_main_frame,
const GURL& url,
- PageTransition::Type transition_type) {
+ content::PageTransition transition_type) {
if (!navigation_state_.CanSendEvents(frame_id))
return;
@@ -582,7 +583,7 @@
const GURL& url,
const GURL& referrer,
WindowOpenDisposition disposition,
- PageTransition::Type transition,
+ content::PageTransition transition,
int64 source_frame_id) {
if (!navigation_state_.CanSendEvents(source_frame_id))
return;
« no previous file with comments | « chrome/browser/extensions/extension_webnavigation_api.h ('k') | chrome/browser/extensions/extension_webstore_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698