Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h |
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h |
index d2b7de509ee17537b0bc4857ed66346d2077fcf7..956058791cf0cd0989a9dc60bc18657bef3576ca 100644 |
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h |
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h |
@@ -19,6 +19,7 @@ |
class ContentSettingImageModel; |
class LocationBarView; |
+class ContentSettingBubbleDialogTest; |
tapted
2017/02/03 00:35:40
nit: sort (but, also, since they share a namespac
kylix_rd
2017/02/03 18:55:04
Done.
|
namespace content { |
class WebContents; |
@@ -47,7 +48,14 @@ class ContentSettingImageView : public IconLabelBubbleView, |
// Updates the decoration from the shown WebContents. |
void Update(content::WebContents* web_contents); |
+ // For testing. Return this view's ContentSettingImageModel. |
+ ContentSettingImageModel* content_setting_image_model() { |
+ return content_setting_image_model_.get(); |
+ } |
+ |
private: |
+ friend class ContentSettingBubbleDialogTest; |
+ |
// The total animation time, including open and close as well as an |
// intervening "stay open" period. |
static const int kAnimationDurationMS; |
@@ -80,6 +88,11 @@ class ContentSettingImageView : public IconLabelBubbleView, |
// Updates the image and tooltip to match the current model state. |
void UpdateImage(); |
+ // Return the currently active bubble dialog. Used for testing. |
+ views::BubbleDialogDelegateView* bubble_view() { |
tapted
2017/02/03 00:35:40
This shouldn't be necessary here (a private access
kylix_rd
2017/02/03 18:55:04
I figured that with the inline method, it would co
tapted
2017/02/03 23:07:02
This violates https://chromium.googlesource.com/ch
|
+ return bubble_view_; |
+ } |
+ |
LocationBarView* parent_; // Weak, owns us. |
std::unique_ptr<ContentSettingImageModel> content_setting_image_model_; |
gfx::SlideAnimation slide_animator_; |