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

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm

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/cocoa/location_bar/location_icon_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
index 2de6fc2cb8b6cd4150470c811e160713e78a0ea2..5a6f0f18e901de26509b87c71031e4aa080ea0bb 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
@@ -105,13 +105,8 @@ bool LocationIconDecoration::OnMousePressed(NSRect frame, NSPoint location) {
// bubble.
// Do not show page info if the user has been editing the location
- // bar, or the location bar is at the NTP. However, if the origin chip is
- // enabled, the omnibox will be empty by default, so the page info should be
- // shown in those cases as well.
- if (chrome::ShouldDisplayOriginChip() ?
- (owner_->GetOmniboxView()->model() &&
- owner_->GetOmniboxView()->model()->user_input_in_progress()) :
- owner_->GetOmniboxView()->IsEditingOrEmpty())
+ // bar, or the location bar is at the NTP.
+ if (owner_->GetOmniboxView()->IsEditingOrEmpty())
return true;
WebContents* tab = owner_->GetWebContents();

Powered by Google App Engine
This is Rietveld 408576698