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

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

Issue 2394143004: Harmony - Update anchors for the rest of the location bar icons that (Closed)
Patch Set: actually fix Created 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/content_setting_image_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e1e577ffc68c732c09858d281a72029929a8603c..c914f155c039f57d574b2129da9b2c72a1c74e9f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -61,7 +61,6 @@
#include "chrome/browser/ui/view_ids.h"
#include "chrome/browser/ui/views/accelerator_table.h"
#include "chrome/browser/ui/views/accessibility/invert_bubble_view.h"
-#include "chrome/browser/ui/views/autofill/save_card_bubble_views.h"
#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
#include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
@@ -1249,13 +1248,8 @@ autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble(
content::WebContents* web_contents,
autofill::SaveCardBubbleController* controller,
bool is_user_gesture) {
- views::View* anchor_view = toolbar_->GetSaveCreditCardBubbleAnchor();
- autofill::SaveCardBubbleViews* view = new autofill::SaveCardBubbleViews(
- anchor_view, web_contents, controller);
- toolbar_->OnBubbleCreatedForAnchor(anchor_view, view->GetWidget());
- view->Show(is_user_gesture ? autofill::SaveCardBubbleViews::USER_GESTURE
- : autofill::SaveCardBubbleViews::AUTOMATIC);
- return view;
+ return toolbar_->ShowSaveCreditCardBubble(web_contents, controller,
+ is_user_gesture);
}
void BrowserView::ShowTranslateBubble(
@@ -1270,21 +1264,14 @@ void BrowserView::ShowTranslateBubble(
return;
}
- ChromeTranslateClient* chrome_translate_client =
- ChromeTranslateClient::FromWebContents(web_contents);
translate::LanguageState& language_state =
- chrome_translate_client->GetLanguageState();
+ ChromeTranslateClient::FromWebContents(web_contents)->GetLanguageState();
language_state.SetTranslateEnabled(true);
- if (IsMinimized())
- return;
-
- views::View* anchor_view = toolbar_->GetTranslateBubbleAnchor();
- views::Widget* bubble_widget = TranslateBubbleView::ShowBubble(
- anchor_view, web_contents, step,
- error_type, is_user_gesture ? TranslateBubbleView::USER_GESTURE
- : TranslateBubbleView::AUTOMATIC);
- toolbar_->OnBubbleCreatedForAnchor(anchor_view, bubble_widget);
+ if (!IsMinimized()) {
+ toolbar_->ShowTranslateBubble(web_contents, step, error_type,
+ is_user_gesture);
+ }
}
#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/content_setting_image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698