TranslateManager is no longer a singleton

chrome/browser/translate/translate_tab_helper.cc

 // Copyright 2011 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 "chrome/browser/translate/translate_tab_helper.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_accept_languages_factory.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/translate/translate_bubble_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "components/translate/core/browser/page_translated_details.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/translate/core/common/language_detection_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TranslateTabHelper);
 
 TranslateTabHelper::TranslateTabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      translate_driver_(&web_contents->GetController()) {
-}
+      translate_driver_(&web_contents->GetController()),
+      translate_manager_(this) {}
 
 TranslateTabHelper::~TranslateTabHelper() {
 }
 
 LanguageState& TranslateTabHelper::GetLanguageState() {
   return translate_driver_.language_state();
 }
 
 // static
 scoped_ptr<TranslatePrefs> TranslateTabHelper::CreateTranslatePrefs(
     PrefService* prefs) {
 #if defined(OS_CHROMEOS)
   const char* preferred_languages_prefs = prefs::kLanguagePreferredLanguages;
 #else
   const char* preferred_languages_prefs = NULL;
 #endif
   return scoped_ptr<TranslatePrefs>(new TranslatePrefs(
       prefs, prefs::kAcceptLanguages, preferred_languages_prefs));
 }
 
 // static
 TranslateAcceptLanguages* TranslateTabHelper::GetTranslateAcceptLanguages(
     content::BrowserContext* browser_context) {
   return TranslateAcceptLanguagesFactory::GetForBrowserContext(browser_context);
 }
 
+// static
+TranslateManager* TranslateTabHelper::GetManagerFromWebContents(
+    content::WebContents* web_contents) {
+  return FromWebContents(web_contents)->GetTranslateManager();

[blundell, 2014/02/17 15:26:28]

This should short-circuit out if the TranslateTabHelper is NULL.

[droger, 2014/02/17 16:52:48]

Done.

+}
+
+TranslateManager* TranslateTabHelper::GetTranslateManager() {
+  return &translate_manager_;
+}
+
+content::WebContents* TranslateTabHelper::GetWebContents() {
+  return content::WebContentsObserver::web_contents();

[blundell, 2014/02/17 15:26:28]

Can't this body just be web_contents()?

[droger, 2014/02/17 16:52:48]

Done.

+}
+
 void TranslateTabHelper::ShowTranslateUI(TranslateTabHelper::TranslateStep step,
-                                         content::WebContents* web_contents,
                                          const std::string source_language,
                                          const std::string target_language,
                                          TranslateErrors::Type error_type) {
   if (error_type != TranslateErrors::NONE)
     step = TranslateTabHelper::TRANSLATE_ERROR;
 
   if (TranslateService::IsTranslateBubbleEnabled()) {
     // Bubble UI.
     if (step == BEFORE_TRANSLATE) {
       // TODO: Move this logic out of UI code.
       GetLanguageState().SetTranslateEnabled(true);
       if (!GetLanguageState().HasLanguageChanged())
         return;
     }
-    ShowBubble(web_contents, step, error_type);
+    ShowBubble(step, error_type);
     return;
   }
 
   // Infobar UI.
   Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   Profile* original_profile = profile->GetOriginalProfile();
   TranslateInfoBarDelegate::Create(step != BEFORE_TRANSLATE,
-                                   web_contents,
+                                   web_contents(),
                                    step,
                                    source_language,
                                    target_language,
                                    error_type,
                                    original_profile->GetPrefs());
 }
 
 bool TranslateTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(TranslateTabHelper, message)
@@ skipping 34 matching lines @@
   PageTranslatedDetails details;
   details.source_language = original_lang;
   details.target_language = translated_lang;
   details.error_type = error_type;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PAGE_TRANSLATED,
       content::Source<content::WebContents>(web_contents()),
       content::Details<PageTranslatedDetails>(&details));
 }
 
-void TranslateTabHelper::ShowBubble(content::WebContents* web_contents,
-                                    TranslateTabHelper::TranslateStep step,
+void TranslateTabHelper::ShowBubble(TranslateTabHelper::TranslateStep step,
                                     TranslateErrors::Type error_type) {
 // The bubble is implemented only on the desktop platforms.
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
-  Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
 
   // |browser| might be NULL when testing. In this case, Show(...) should be
   // called because the implementation for testing is used.
   if (!browser) {
-    TranslateBubbleFactory::Show(NULL, web_contents, step, error_type);
+    TranslateBubbleFactory::Show(NULL, web_contents(), step, error_type);
     return;
   }
 
-  if (web_contents != browser->tab_strip_model()->GetActiveWebContents())
+  if (web_contents() != browser->tab_strip_model()->GetActiveWebContents())
     return;
 
   // This ShowBubble function is also used for upating the existing bubble.
   // However, with the bubble shown, any browser windows are NOT activated
   // because the bubble takes the focus from the other widgets including the
   // browser windows. So it is checked that |browser| is the last activated
   // browser, not is now activated.
   if (browser !=
       chrome::FindLastActiveWithHostDesktopType(browser->host_desktop_type())) {
     return;
   }
 
   // During auto-translating, the bubble should not be shown.
   if (step == TranslateTabHelper::TRANSLATING ||
       step == TranslateTabHelper::AFTER_TRANSLATE) {
     if (GetLanguageState().InTranslateNavigation())
       return;
   }
 
   TranslateBubbleFactory::Show(
-      browser->window(), web_contents, step, error_type);
+      browser->window(), web_contents(), step, error_type);
 #else
   NOTREACHED();
 #endif
 }