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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1402363013: Update location bar bubble/icon behavior. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 LoadingAnimationCallback(); 849 LoadingAnimationCallback();
850 } 850 }
851 } 851 }
852 } 852 }
853 853
854 void BrowserView::SetStarredState(bool is_starred) { 854 void BrowserView::SetStarredState(bool is_starred) {
855 GetLocationBarView()->SetStarToggled(is_starred); 855 GetLocationBarView()->SetStarToggled(is_starred);
856 } 856 }
857 857
858 void BrowserView::SetTranslateIconToggled(bool is_lit) { 858 void BrowserView::SetTranslateIconToggled(bool is_lit) {
859 GetLocationBarView()->SetTranslateIconToggled(is_lit); 859 // Translate icon is never active on Views.
860 } 860 }
861 861
862 void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, 862 void BrowserView::OnActiveTabChanged(content::WebContents* old_contents,
863 content::WebContents* new_contents, 863 content::WebContents* new_contents,
864 int index, 864 int index,
865 int reason) { 865 int reason) {
866 DCHECK(new_contents); 866 DCHECK(new_contents);
867 867
868 // If |contents_container_| already has the correct WebContents, we can save 868 // If |contents_container_| already has the correct WebContents, we can save
869 // some work. This also prevents extra events from being reported by the 869 // some work. This also prevents extra events from being reported by the
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 } 1274 }
1275 1275
1276 void BrowserView::ShowBookmarkAppBubble( 1276 void BrowserView::ShowBookmarkAppBubble(
1277 const WebApplicationInfo& web_app_info, 1277 const WebApplicationInfo& web_app_info,
1278 const ShowBookmarkAppBubbleCallback& callback) { 1278 const ShowBookmarkAppBubbleCallback& callback) {
1279 BookmarkAppBubbleView::ShowBubble(GetToolbarView(), web_app_info, callback); 1279 BookmarkAppBubbleView::ShowBubble(GetToolbarView(), web_app_info, callback);
1280 } 1280 }
1281 1281
1282 autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble( 1282 autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble(
1283 content::WebContents* web_contents, 1283 content::WebContents* web_contents,
1284 autofill::SaveCardBubbleController* controller) { 1284 autofill::SaveCardBubbleController* controller,
1285 autofill::SaveCardBubbleView* view = new autofill::SaveCardBubbleViews( 1285 bool is_user_gesture) {
1286 autofill::SaveCardBubbleViews* view = new autofill::SaveCardBubbleViews(
1286 GetToolbarView()->GetSaveCreditCardBubbleAnchor(), web_contents, 1287 GetToolbarView()->GetSaveCreditCardBubbleAnchor(), web_contents,
1287 controller); 1288 controller);
1288 view->Show(); 1289 view->Show(is_user_gesture ? autofill::SaveCardBubbleViews::USER_GESTURE
1290 : autofill::SaveCardBubbleViews::AUTOMATIC);
1289 return view; 1291 return view;
1290 } 1292 }
1291 1293
1292 void BrowserView::ShowTranslateBubble( 1294 void BrowserView::ShowTranslateBubble(
1293 content::WebContents* web_contents, 1295 content::WebContents* web_contents,
1294 translate::TranslateStep step, 1296 translate::TranslateStep step,
1295 translate::TranslateErrors::Type error_type, 1297 translate::TranslateErrors::Type error_type,
1296 bool is_user_gesture) { 1298 bool is_user_gesture) {
1297 if (contents_web_view_->HasFocus() && 1299 if (contents_web_view_->HasFocus() &&
1298 !GetLocationBarView()->IsMouseHovered()) { 1300 !GetLocationBarView()->IsMouseHovered()) {
1299 content::RenderViewHost* rvh = web_contents->GetRenderViewHost(); 1301 content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
1300 if (rvh->IsFocusedElementEditable()) 1302 if (rvh->IsFocusedElementEditable())
1301 return; 1303 return;
1302 } 1304 }
1303 1305
1304 ChromeTranslateClient* chrome_translate_client = 1306 ChromeTranslateClient* chrome_translate_client =
1305 ChromeTranslateClient::FromWebContents(web_contents); 1307 ChromeTranslateClient::FromWebContents(web_contents);
1306 translate::LanguageState& language_state = 1308 translate::LanguageState& language_state =
1307 chrome_translate_client->GetLanguageState(); 1309 chrome_translate_client->GetLanguageState();
1308 language_state.SetTranslateEnabled(true); 1310 language_state.SetTranslateEnabled(true);
1309 1311
1310 if (IsMinimized()) 1312 if (IsMinimized())
1311 return; 1313 return;
1312 1314
1313 TranslateBubbleView::ShowBubble( 1315 TranslateBubbleView::ShowBubble(
1314 GetToolbarView()->GetTranslateBubbleAnchor(), web_contents, step, 1316 GetToolbarView()->GetTranslateBubbleAnchor(), web_contents, step,
1315 error_type, is_user_gesture); 1317 error_type, is_user_gesture ? TranslateBubbleView::USER_GESTURE
1318 : TranslateBubbleView::AUTOMATIC);
1316 } 1319 }
1317 1320
1318 bool BrowserView::IsProfileResetBubbleSupported() const { 1321 bool BrowserView::IsProfileResetBubbleSupported() const {
1319 return true; 1322 return true;
1320 } 1323 }
1321 1324
1322 GlobalErrorBubbleViewBase* BrowserView::ShowProfileResetBubble( 1325 GlobalErrorBubbleViewBase* BrowserView::ShowProfileResetBubble(
1323 const base::WeakPtr<ProfileResetGlobalError>& global_error) { 1326 const base::WeakPtr<ProfileResetGlobalError>& global_error) {
1324 return ProfileResetBubbleView::ShowBubble(global_error, browser_.get()); 1327 return ProfileResetBubbleView::ShowBubble(global_error, browser_.get());
1325 } 1328 }
(...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after
2649 return immersive_mode_controller()->IsEnabled(); 2652 return immersive_mode_controller()->IsEnabled();
2650 } 2653 }
2651 2654
2652 views::Widget* BrowserView::GetBubbleAssociatedWidget() { 2655 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
2653 return GetWidget(); 2656 return GetWidget();
2654 } 2657 }
2655 2658
2656 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { 2659 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
2657 return top_container_->GetBoundsInScreen(); 2660 return top_container_->GetBoundsInScreen();
2658 } 2661 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698