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

Unified Diff: chrome/browser/ui/views/location_bar/location_icon_view.cc

Issue 287543002: Remove origin chip v1 and "hide on input" v2 behavior. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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/location_bar/location_icon_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
index a096cd84e6a0675a6a86976a3aa00ae5236d2f24..7a3b17978d7db5c34c7ab815a370ff46e1df679f 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/search/search.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -55,11 +54,8 @@ void LocationIconView::OnGestureEvent(ui::GestureEvent* event) {
void LocationIconView::OnClickOrTap(const ui::LocatedEvent& event) {
// Do not show page info if the user has been editing the location bar or the
- // location bar is at the NTP. Also skip showing the page info if the
- // toolbar-based origin chip is being shown because it is responsible for
- // showing the page info instead.
- if (page_info_helper_.location_bar()->GetOmniboxView()->IsEditingOrEmpty() ||
- chrome::ShouldDisplayOriginChip())
+ // location bar is at the NTP.
+ if (page_info_helper_.location_bar()->GetOmniboxView()->IsEditingOrEmpty())
return;
page_info_helper_.ProcessEvent(event);
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698