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

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: Use kAnimateNone Created 6 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0dcad4068e948df18e27d45947b43b6c68443a08..94bb1dc9e5f0fe10d8e006d17c53a1aaf69ca7e7 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/chrome_password_manager_client.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"
@@ -285,11 +286,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,
@@ -494,7 +495,14 @@ void BrowserWindowCocoa::ShowTranslateBubble(
content::WebContents* contents,
TranslateTabHelper::TranslateStep step,
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
+ step:step
+ errorType:error_type];
}
#if defined(ENABLE_ONE_CLICK_SIGNIN)
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698