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

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h

Issue 2752623003: [Mac] Fix for the security chip (Closed)
Patch Set: . Created 3 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/cocoa/website_settings/permission_bubble_controller.h
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h
index a886446fe8b333e7c84161adc27364600776f320..4272422a023c8dea27e2884773bf95f4087d249d 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h
@@ -5,17 +5,18 @@
#import <Cocoa/Cocoa.h>
#include "base/mac/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/omnibox_decoration_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
#include "chrome/browser/ui/website_settings/permission_prompt.h"
#include "ui/base/models/simple_menu_model.h"
class Browser;
+class LocationBarDecoration;
@class MenuController;
class PermissionBubbleCocoa;
class PermissionRequest;
@interface PermissionBubbleController
- : OmniboxDecorationBubbleController<NSTextViewDelegate> {
+ : BaseBubbleController<NSTextViewDelegate> {
@private
// Array of views that are the checkboxes for every requested permission.
// Only populated if multiple requests are shown at once.
@@ -32,6 +33,12 @@ class PermissionRequest;
// Bridge to the C++ class that created this object.
PermissionBubbleCocoa* bridge_; // Weak.
+
+ // The omnibox icon the bubble is anchored to. The icon is set as active
+ // when the bubble is opened, and inactive when the bubble is closed.
+ // Usually we would override OmniboxDecorationBubbleController but the page
+ // info icon has a special case where it might cause a race condition.
+ LocationBarDecoration* decoration_;
Robert Sesek 2017/03/15 17:35:09 // Weak.
spqchan 2017/03/15 21:18:47 Done.
}
// Designated initializer. |browser| and |bridge| must both be non-nil.

Powered by Google App Engine
This is Rietveld 408576698