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

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

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge Created 5 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/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 30bfc7d844423536920581f270145441da8984da..33ee5a13f0b62b91d5e3536a09e95e27b1a61112 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1079,15 +1079,7 @@ void BrowserView::SetFocusToLocationBar(bool select_all) {
LocationBarView* location_bar = GetLocationBarView();
if (location_bar->omnibox_view()->IsFocusable()) {
// Location bar got focus.
- //
- // select_all is true when it's expected that the user may want to copy
- // the URL to the clipboard. If the URL is not being shown because the
- // origin chip is enabled, show it now to support the same functionality.
- if (select_all &&
- location_bar->GetToolbarModel()->WouldOmitURLDueToOriginChip())
- location_bar->ShowURL();
- else
- location_bar->FocusLocation(select_all);
+ location_bar->FocusLocation(select_all);
} else {
// If none of location bar got focus, then clear focus.
views::FocusManager* focus_manager = GetFocusManager();
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_unittest.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698