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

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

Issue 197623002: [OriginChip] Show the page info bubble on the location bar icon. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a post-merge inconsistency Created 6 years, 9 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/page_info_helper.cc
diff --git a/chrome/browser/ui/views/location_bar/page_info_helper.cc b/chrome/browser/ui/views/location_bar/page_info_helper.cc
index 98c596ac6c5a4dfa798eeeca3a3fd5344a92d364..e92f809627bc86a0606dc81df62ccda7c23cf615 100644
--- a/chrome/browser/ui/views/location_bar/page_info_helper.cc
+++ b/chrome/browser/ui/views/location_bar/page_info_helper.cc
@@ -26,24 +26,13 @@ void PageInfoHelper::ProcessEvent(const ui::LocatedEvent& event) {
if (!owner_->HitTestPoint(event.location()))
return;
- // Do not show page info if the user has been editing the location
- // bar, or the location bar is at the NTP.
- if (location_bar_->GetOmniboxView()->IsEditingOrEmpty() &&
- !chrome::ShouldDisplayOriginChip() &&
- !chrome::ShouldDisplayOriginChipV2())
- return;
-
WebContents* tab = location_bar_->GetWebContents();
if (!tab)
return;
const NavigationController& controller = tab->GetController();
// Important to use GetVisibleEntry to match what's showing in the omnibox.
NavigationEntry* nav_entry = controller.GetVisibleEntry();
- if (!nav_entry) {
- NOTREACHED();
- return;
- }
-
+ DCHECK(nav_entry);
location_bar_->delegate()->ShowWebsiteSettings(
tab, nav_entry->GetURL(), nav_entry->GetSSL());
}
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_icon_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