Fix page transition qualifiers not masked out

components/translate/content/browser/content_translate_driver.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/translate/content/browser/content_translate_driver.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 68 matching lines @@
 
   translate_manager_->InitiateTranslation(
       translate::TranslateDownloadManager::GetLanguageCode(page_lang));
 }
 
 // TranslateDriver methods
 
 bool ContentTranslateDriver::IsLinkNavigation() {
   return navigation_controller_ &&
          navigation_controller_->GetLastCommittedEntry() &&
-         navigation_controller_->GetLastCommittedEntry()->GetTransitionType() ==
-             ui::PAGE_TRANSITION_LINK;
+         ui::PageTransitionCoreTypeIs(
+             navigation_controller_->GetLastCommittedEntry()
+                 ->GetTransitionType(),
+             ui::PAGE_TRANSITION_LINK);
 }
 
 void ContentTranslateDriver::OnTranslateEnabledChanged() {
   content::WebContents* web_contents = navigation_controller_->GetWebContents();
   FOR_EACH_OBSERVER(
       Observer, observer_list_, OnTranslateEnabledChanged(web_contents));
 }
 
 void ContentTranslateDriver::OnIsPageTranslatedChanged() {
     content::WebContents* web_contents =
@@ skipping 71 matching lines @@
 
   if (!load_details.is_main_frame &&
       translate_manager_->GetLanguageState().translation_declined()) {
     // Some sites (such as Google map) may trigger sub-frame navigations
     // when the user interacts with the page.  We don't want to show a new
     // infobar if the user already dismissed one in that case.
     return;
   }
 
   // If not a reload, return.
-  if (entry->GetTransitionType() != ui::PAGE_TRANSITION_RELOAD &&
+  if (!ui::PageTransitionCoreTypeIs(entry->GetTransitionType(),
+                                    ui::PAGE_TRANSITION_RELOAD) &&
       load_details.type != content::NAVIGATION_TYPE_SAME_PAGE) {
     return;
   }
 
   if (!translate_manager_->GetLanguageState().page_needs_translation())
     return;
 
   // Note that we delay it as the ordering of the processing of this callback
   // by WebContentsObservers is undefined and might result in the current
   // infobars being removed. Since the translation initiation process might add
   // an infobar, it must be done after that.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&ContentTranslateDriver::InitiateTranslation,
                  weak_pointer_factory_.GetWeakPtr(),
                  translate_manager_->GetLanguageState().original_language(),
                  0));
 }
 
 void ContentTranslateDriver::DidNavigateAnyFrame(
     content::RenderFrameHost* render_frame_host,
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Let the LanguageState clear its state.
   const bool reload =
-      details.entry->GetTransitionType() == ui::PAGE_TRANSITION_RELOAD ||
+      ui::PageTransitionCoreTypeIs(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);
 }
 
 bool ContentTranslateDriver::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ContentTranslateDriver, message)
@@ skipping 36 matching lines @@
     TranslateErrors::Type error_type) {
   translate_manager_->PageTranslated(
       original_lang, translated_lang, error_type);
   FOR_EACH_OBSERVER(
       Observer,
       observer_list_,
       OnPageTranslated(original_lang, translated_lang, error_type));
 }
 
 }  // namespace translate