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

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

Issue 151283006: Mac OS X: Show the Translate icon on Omnibox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue-307352-translate-bubble-2
Patch Set: Nico's review Created 6 years, 10 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_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 4287c001157e61e8229bba4a18a6b49dcd4a8b16..5fd4f6bced8a5ada40cbccf0c8a7a0d1e35d203d 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -20,6 +20,7 @@
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/shell_integration.h"
+#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_command_controller.h"
#include "chrome/browser/ui/browser_commands_mac.h"
@@ -279,11 +280,11 @@ void BrowserWindowCocoa::UpdateLoadingAnimations(bool should_animate) {
}
void BrowserWindowCocoa::SetStarredState(bool is_starred) {
- [controller_ setStarredState:is_starred ? YES : NO];
+ [controller_ setStarredState:is_starred];
}
void BrowserWindowCocoa::SetTranslateIconToggled(bool is_lit) {
- NOTIMPLEMENTED();
+ [controller_ setCurrentPageIsTranslated:is_lit];
}
void BrowserWindowCocoa::OnActiveTabChanged(content::WebContents* old_contents,
@@ -482,7 +483,14 @@ void BrowserWindowCocoa::ShowTranslateBubble(
content::WebContents* contents,
TranslateBubbleModel::ViewState view_state,
TranslateErrors::Type error_type) {
- NOTIMPLEMENTED();
+ TranslateTabHelper* translate_tab_helper =
+ TranslateTabHelper::FromWebContents(contents);
+ LanguageState& language_state = translate_tab_helper->GetLanguageState();
+ language_state.SetTranslateEnabled(true);
+
+ [controller_ showTranslateBubbleForWebContents:contents
+ viewState:view_state
+ errorType:error_type];
}
#if defined(ENABLE_ONE_CLICK_SIGNIN)

Powered by Google App Engine
This is Rietveld 408576698