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

Unified Diff: components/translate/content/browser/content_translate_driver.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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: components/translate/content/browser/content_translate_driver.cc
diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc
index ffdd17d157d746047b138b1164692a1302469e78..ab86100a80bfabebbe74521f21870a0f8eb52234 100644
--- a/components/translate/content/browser/content_translate_driver.cc
+++ b/components/translate/content/browser/content_translate_driver.cc
@@ -80,7 +80,7 @@ void ContentTranslateDriver::InitiateTranslation(const std::string& page_lang,
bool ContentTranslateDriver::IsLinkNavigation() {
return navigation_controller_ && navigation_controller_->GetActiveEntry() &&
navigation_controller_->GetActiveEntry()->GetTransitionType() ==
- content::PAGE_TRANSITION_LINK;
+ ui::PAGE_TRANSITION_LINK;
}
void ContentTranslateDriver::OnTranslateEnabledChanged() {
@@ -149,7 +149,7 @@ void ContentTranslateDriver::OpenUrlInNewTab(const GURL& url) {
content::OpenURLParams params(url,
content::Referrer(),
NEW_FOREGROUND_TAB,
- content::PAGE_TRANSITION_LINK,
+ ui::PAGE_TRANSITION_LINK,
false);
navigation_controller_->GetWebContents()->OpenURL(params);
}
@@ -185,7 +185,7 @@ void ContentTranslateDriver::NavigationEntryCommitted(
}
// If not a reload, return.
- if (entry->GetTransitionType() != content::PAGE_TRANSITION_RELOAD &&
+ if (entry->GetTransitionType() != ui::PAGE_TRANSITION_RELOAD &&
load_details.type != content::NAVIGATION_TYPE_SAME_PAGE) {
return;
}
@@ -210,7 +210,7 @@ void ContentTranslateDriver::DidNavigateAnyFrame(
const content::FrameNavigateParams& params) {
// Let the LanguageState clear its state.
const bool reload =
- details.entry->GetTransitionType() == content::PAGE_TRANSITION_RELOAD ||
+ details.entry->GetTransitionType() == ui::PAGE_TRANSITION_RELOAD ||
details.type == content::NAVIGATION_TYPE_SAME_PAGE;
translate_manager_->GetLanguageState().DidNavigate(
details.is_in_page, details.is_main_frame, reload);

Powered by Google App Engine
This is Rietveld 408576698