Chromium Code Reviews| Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h |
| diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h |
| index 417e4d82c8105b4bf222c7667b51de9366e030be..8eaa29a7b0aa5275102def4b4163c5ecab4c4913 100644 |
| --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h |
| +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h |
| @@ -8,6 +8,7 @@ |
| #include "base/macros.h" |
| #include "base/memory/scoped_ptr.h" |
| #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h" |
| +#import "chrome/browser/ui/cocoa/location_bar/content_setting_bubble_views_mac.h" |
|
tapted
2016/01/11 02:50:58
nit: I think this can be forward declared. Also in
|
| #include "components/content_settings/core/common/content_settings_types.h" |
| // ContentSettingDecoration is used to display the content settings |
| @@ -22,6 +23,10 @@ namespace content { |
| class WebContents; |
| } |
| +namespace views { |
|
tapted
2016/01/11 02:50:57
nit: forward dec not needed (I think?). But also f
|
| +class Widget; |
| +} |
| + |
| class ContentSettingDecoration : public ImageDecoration { |
| public: |
| // ContentSettingDecoration takes ownership of its model. |
| @@ -68,6 +73,8 @@ class ContentSettingDecoration : public ImageDecoration { |
| CGFloat text_width_; |
| base::scoped_nsobject<NSAttributedString> animated_text_; |
| + std::unique_ptr<ContentSettingBubbleBridge> bubble_bridge_; |
|
tapted
2016/01/11 02:50:57
std::unique_ptr is still on the "to be discussed"
|
| + |
| DISALLOW_COPY_AND_ASSIGN(ContentSettingDecoration); |
| }; |