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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 25373009: Translate: New Bubble UX (for the view toolkit) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add the browser test Created 7 years, 2 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/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 47031510a4c159024e0b9912bafad29fa1085bde..a419724d435946ece58a2c85b354592f116441c3 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -34,6 +34,7 @@
#include "chrome/browser/speech/tts_controller.h"
#include "chrome/browser/themes/theme_properties.h"
#include "chrome/browser/themes/theme_service_factory.h"
+#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
#include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h"
@@ -83,6 +84,7 @@
#include "chrome/browser/ui/views/tabs/tab.h"
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "chrome/browser/ui/views/toolbar_view.h"
+#include "chrome/browser/ui/views/translate/translate_bubble_view.h"
#include "chrome/browser/ui/views/update_recommended_message_box.h"
#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
#include "chrome/browser/ui/window_sizer/window_sizer.h"
@@ -1160,6 +1162,21 @@ void BrowserView::ShowBookmarkPrompt() {
GetLocationBarView()->ShowBookmarkPrompt();
}
+void BrowserView::ShowTranslateBubble(
+ content::WebContents* web_contents,
+ TranslateBubbleModel::ViewState view_state) {
+ if (web_contents != browser_->tab_strip_model()->GetActiveWebContents())
+ return;
+
+ TranslateTabHelper* translate_tab_helper =
+ TranslateTabHelper::FromWebContents(web_contents);
+ LanguageState& language_state = translate_tab_helper->language_state();
+ language_state.SetTranslateEnabled(true);
+
+ TranslateBubbleView::ShowBubble(GetToolbarView()->GetTranslateBubbleAnchor(),
+ web_contents, view_state, browser_.get());
+}
+
#if defined(ENABLE_ONE_CLICK_SIGNIN)
void BrowserView::ShowOneClickSigninBubble(
OneClickSigninBubbleType type,
@@ -1420,6 +1437,14 @@ ToolbarView* BrowserView::GetToolbarView() const {
return toolbar_;
}
+TranslateBubbleModel* BrowserView::GetTranslateBubbleModel() const {
+ TranslateBubbleView* view = TranslateBubbleView::GetCurrentBubble();
+ if (!view)
+ return NULL;
+
+ return view->model();
+}
+
///////////////////////////////////////////////////////////////////////////////
// BrowserView, TabStripModelObserver implementation:

Powered by Google App Engine
This is Rietveld 408576698