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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

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/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 74ba69155236bc5293cb6ea51f71a203fb83c040..1c613ea35945ef4ecaebdb224291d5547af231b0 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1753,7 +1753,8 @@ using content::WebContents;
- (void)showTranslateBubbleForWebContents:(content::WebContents*)contents
step:(translate::TranslateStep)step
- errorType:(TranslateErrors::Type)errorType {
+ errorType:(translate::TranslateErrors::Type)
+ errorType {
// TODO(hajimehoshi): The similar logic exists at TranslateBubbleView::
// ShowBubble. This should be unified.
if (translateBubbleController_) {
@@ -1779,10 +1780,12 @@ using content::WebContents;
ChromeTranslateClient::GetTranslateLanguages(
contents, &sourceLanguage, &targetLanguage);
- scoped_ptr<TranslateUIDelegate> uiDelegate(new TranslateUIDelegate(
- ChromeTranslateClient::GetManagerFromWebContents(contents)->GetWeakPtr(),
- sourceLanguage,
- targetLanguage));
+ scoped_ptr<translate::TranslateUIDelegate> uiDelegate(
+ new translate::TranslateUIDelegate(
+ ChromeTranslateClient::GetManagerFromWebContents(contents)
+ ->GetWeakPtr(),
+ sourceLanguage,
+ targetLanguage));
scoped_ptr<TranslateBubbleModel> model(
new TranslateBubbleModelImpl(step, uiDelegate.Pass()));
translateBubbleController_ = [[TranslateBubbleController alloc]

Powered by Google App Engine
This is Rietveld 408576698