Chromium Code Reviews| 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 389932c8268a7d5acd2824d41f3b73e51dc1c48c..d8e10bc8070600211eed530ff088e39d746dfc9f 100644 |
| --- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm |
| +++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm |
| @@ -6,6 +6,7 @@ |
| #include "base/strings/sys_string_conversions.h" |
| #include "chrome/browser/favicon/favicon_tab_helper.h" |
| +#include "chrome/browser/search/search.h" |
| #include "chrome/browser/ui/browser.h" |
| #include "chrome/browser/ui/browser_commands.h" |
| #include "chrome/browser/ui/browser_finder.h" |
| @@ -94,10 +95,14 @@ bool LocationIconDecoration::AcceptsMousePress() { |
| return true; |
| } |
| -bool LocationIconDecoration::OnMousePressed(NSRect frame) { |
| +bool LocationIconDecoration::OnMousePressed(NSRect frame, NSPoint location) { |
| // Do not show page info if the user has been editing the location |
| // bar, or the location bar is at the NTP. |
| - if (owner_->GetOmniboxView()->IsEditingOrEmpty()) |
| + if ((chrome::ShouldDisplayOriginChipV2() && |
|
groby-ooo-7-16
2014/04/10 21:26:09
Why the separate branch for ShouldDisplayOriginChi
macourteau
2014/04/28 19:19:24
I call this method to display the page info bubble
groby-ooo-7-16
2014/04/30 21:55:39
Yuck :)
You probably want to at least leave a com
macourteau
2014/05/01 19:04:48
Done.
|
| + owner_->GetOmniboxView()->model() && |
| + owner_->GetOmniboxView()->model()->user_input_in_progress()) || |
| + (!chrome::ShouldDisplayOriginChipV2() && |
| + owner_->GetOmniboxView()->IsEditingOrEmpty())) |
| return true; |
| WebContents* tab = owner_->GetWebContents(); |