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

Unified Diff: chrome/browser/translate/chrome_translate_client.h

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing android build errors Created 6 years, 5 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: chrome/browser/translate/chrome_translate_client.h
diff --git a/chrome/browser/translate/chrome_translate_client.h b/chrome/browser/translate/chrome_translate_client.h
index 8336838b47c4791e36aa7f9991283ff02e1c92ca..3c22427682e493953c1b6d82f10e64d045731f76 100644
--- a/chrome/browser/translate/chrome_translate_client.h
+++ b/chrome/browser/translate/chrome_translate_client.h
@@ -31,38 +31,44 @@ namespace test {
class ScopedCLDDynamicDataHarness;
} // namespace test
+class PrefService;
+
+namespace translate {
struct LanguageDetectionDetails;
class LanguageState;
-class PrefService;
class TranslateAcceptLanguages;
class TranslatePrefs;
class TranslateManager;
+} // namespace translate
class ChromeTranslateClient
- : public TranslateClient,
+ : public translate::TranslateClient,
public content::WebContentsObserver,
public content::WebContentsUserData<ChromeTranslateClient> {
public:
virtual ~ChromeTranslateClient();
// Gets the LanguageState associated with the page.
- LanguageState& GetLanguageState();
+ translate::LanguageState& GetLanguageState();
// Returns the ContentTranslateDriver instance associated with this
// WebContents.
- ContentTranslateDriver& translate_driver() { return translate_driver_; }
+ translate::ContentTranslateDriver& translate_driver() {
+ return translate_driver_;
+ }
// Helper method to return a new TranslatePrefs instance.
- static scoped_ptr<TranslatePrefs> CreateTranslatePrefs(PrefService* prefs);
+ static scoped_ptr<translate::TranslatePrefs> CreateTranslatePrefs(
+ PrefService* prefs);
// Helper method to return the TranslateAcceptLanguages instance associated
// with |browser_context|.
- static TranslateAcceptLanguages* GetTranslateAcceptLanguages(
+ static translate::TranslateAcceptLanguages* GetTranslateAcceptLanguages(
content::BrowserContext* browser_context);
// Helper method to return the TranslateManager instance associated with
// |web_contents|, or NULL if there is no such associated instance.
- static TranslateManager* GetManagerFromWebContents(
+ static translate::TranslateManager* GetManagerFromWebContents(
content::WebContents* web_contents);
// Gets |source| and |target| language for translation.
@@ -71,7 +77,7 @@ class ChromeTranslateClient
std::string* target);
// Gets the associated TranslateManager.
- TranslateManager* GetTranslateManager();
+ translate::TranslateManager* GetTranslateManager();
// Gets the associated WebContents. Returns NULL if the WebContents is being
// destroyed.
@@ -83,17 +89,18 @@ class ChromeTranslateClient
}
// TranslateClient implementation.
- virtual TranslateDriver* GetTranslateDriver() OVERRIDE;
+ virtual translate::TranslateDriver* GetTranslateDriver() OVERRIDE;
virtual PrefService* GetPrefs() OVERRIDE;
- virtual scoped_ptr<TranslatePrefs> GetTranslatePrefs() OVERRIDE;
- virtual TranslateAcceptLanguages* GetTranslateAcceptLanguages() OVERRIDE;
+ virtual scoped_ptr<translate::TranslatePrefs> GetTranslatePrefs() OVERRIDE;
+ virtual translate::TranslateAcceptLanguages* GetTranslateAcceptLanguages()
+ OVERRIDE;
virtual int GetInfobarIconID() const OVERRIDE;
virtual scoped_ptr<infobars::InfoBar> CreateInfoBar(
- scoped_ptr<TranslateInfoBarDelegate> delegate) const OVERRIDE;
+ scoped_ptr<translate::TranslateInfoBarDelegate> delegate) const OVERRIDE;
virtual void ShowTranslateUI(translate::TranslateStep step,
const std::string source_language,
const std::string target_language,
- TranslateErrors::Type error_type,
+ translate::TranslateErrors::Type error_type,
bool triggered_from_menu) OVERRIDE;
virtual bool IsTranslatableURL(const GURL& url) OVERRIDE;
virtual void ShowReportLanguageDetectionErrorUI(
@@ -117,21 +124,21 @@ class ChromeTranslateClient
// IPC handlers.
void OnTranslateAssignedSequenceNumber(int page_seq_no);
- void OnLanguageDetermined(const LanguageDetectionDetails& details,
+ void OnLanguageDetermined(const translate::LanguageDetectionDetails& details,
bool page_needs_translation);
void OnPageTranslated(const std::string& original_lang,
const std::string& translated_lang,
- TranslateErrors::Type error_type);
+ translate::TranslateErrors::Type error_type);
// Shows the translate bubble.
void ShowBubble(translate::TranslateStep step,
- TranslateErrors::Type error_type);
+ translate::TranslateErrors::Type error_type);
// Max number of attempts before checking if a page has been reloaded.
int max_reload_check_attempts_;
- ContentTranslateDriver translate_driver_;
- scoped_ptr<TranslateManager> translate_manager_;
+ translate::ContentTranslateDriver translate_driver_;
+ scoped_ptr<translate::TranslateManager> translate_manager_;
// Provides CLD data for this process.
scoped_ptr<translate::BrowserCldDataProvider> cld_data_provider_;
« no previous file with comments | « chrome/browser/renderer_context_menu/render_view_context_menu.cc ('k') | chrome/browser/translate/chrome_translate_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698