Index: chrome/browser/translate/translate_manager.cc |
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc |
index 338ab641a09f9631e95aab8b130355b92859c4d4..cc2fea6d1c7fd868c5132bd0d96e8a073b39b32d 100644 |
--- a/chrome/browser/translate/translate_manager.cc |
+++ b/chrome/browser/translate/translate_manager.cc |
@@ -43,11 +43,6 @@ |
#include "net/base/url_util.h" |
#include "net/http/http_status_code.h" |
-#if defined(OS_CHROMEOS) |
-#include "chrome/browser/chromeos/file_manager/app_id.h" |
-#include "extensions/common/constants.h" |
-#endif |
- |
using content::NavigationController; |
using content::NavigationEntry; |
using content::WebContents; |
@@ -80,25 +75,6 @@ void NotifyTranslateError(const TranslateErrorDetails& details) { |
TranslateManager::~TranslateManager() {} |
// static |
-bool TranslateManager::IsTranslatableURL(const GURL& url) { |
- // A URLs is translatable unless it is one of the following: |
- // - empty (can happen for popups created with window.open("")) |
- // - an internal URL (chrome:// and others) |
- // - the devtools (which is considered UI) |
- // - Chrome OS file manager extension |
- // - an FTP page (as FTP pages tend to have long lists of filenames that may |
- // confuse the CLD) |
- return !url.is_empty() && |
- !url.SchemeIs(content::kChromeUIScheme) && |
- !url.SchemeIs(content::kChromeDevToolsScheme) && |
-#if defined(OS_CHROMEOS) |
- !(url.SchemeIs(extensions::kExtensionScheme) && |
- url.DomainIs(file_manager::kFileManagerAppId)) && |
-#endif |
- !url.SchemeIs(content::kFtpScheme); |
-} |
- |
-// static |
scoped_ptr<TranslateManager::TranslateErrorCallbackList::Subscription> |
TranslateManager::RegisterTranslateErrorCallback( |
const TranslateManager::TranslateErrorCallback& callback) { |
@@ -158,7 +134,7 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) { |
// Don't translate any Chrome specific page, e.g., New Tab Page, Download, |
// History, and so on. |
GURL page_url = web_contents->GetURL(); |
- if (!IsTranslatableURL(page_url)) { |
+ if (!translate_client_->IsTranslatableURL(page_url)) { |
TranslateBrowserMetrics::ReportInitiationStatus( |
TranslateBrowserMetrics::INITIATION_STATUS_URL_IS_NOT_SUPPORTED); |
return; |