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

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

Issue 2882533003: [Mac] Hover/Active Omnibox Icon States for Secondary UI MD (Closed)
Patch Set: Rebased and applied tapted's changes Created 3 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/cocoa/location_bar/content_setting_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
index 3fb4f0293b77fa6c57d824f38fd72502dfad0e10..9bed979c5867bca407de8ef1be933df1be9868aa 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
@@ -11,11 +11,11 @@
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
-#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/cocoa/browser_dialogs_views_mac.h"
#import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
-#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
#import "chrome/browser/ui/cocoa/l10n_util.h"
+#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
#import "chrome/browser/ui/cocoa/themed_window.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
@@ -306,8 +306,8 @@ bool ContentSettingDecoration::OnMousePressed(NSRect frame, NSPoint location) {
if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
gfx::Point origin = gfx::ScreenPointFromNSPoint(anchor);
chrome::ContentSettingBubbleViewsBridge::Show(
- [web_contents->GetTopLevelNativeWindow() contentView],
- model, web_contents, origin);
+ [web_contents->GetTopLevelNativeWindow() contentView], model,
+ web_contents, origin, this);
} else {
// If the bubble is already opened, close it. Otherwise, open a new bubble.
if (bubbleWindow_ && [bubbleWindow_ isVisible]) {

Powered by Google App Engine
This is Rietveld 408576698