diff options
| author | Sylvain Defresne <sdefresne@chromium.org> | 2014-09-19 12:19:35 +0200 |
|---|---|---|
| committer | Sylvain Defresne <sdefresne@chromium.org> | 2014-09-19 10:20:45 +0000 |
| commit | c6ccc77dc9c080d83e400dc12205bb805a25ac71 (patch) | |
| tree | 8050f444606ddb8eae0297b52676cb2e01e6f8db /components/translate | |
| parent | 80ced42d624a1eec8e8a2f0c0c760ab576d65ead (diff) | |
| download | chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.zip chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.tar.gz chromium_src-c6ccc77dc9c080d83e400dc12205bb805a25ac71.tar.bz2 | |
Move PageTransition from //content/public/common to //ui/base
Move PageTransition enumeration from //content/public/common to //ui/base
so that it can be used by iOS and layered components that are used on iOS.
BUG=372373
R=avi@chromium.org, ben@chromium.org, wfh@chromium.org
TBR=ben, nasko
Review URL: https://codereview.chromium.org/562603002
Cr-Commit-Position: refs/heads/master@{#295686}
Diffstat (limited to 'components/translate')
| -rw-r--r-- | components/translate/content/browser/content_translate_driver.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc index ffdd17d..ab86100 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); |