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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 2668833003: DialogBrowserTest implementation to invoke Content settings bubble dialogs. (Closed)
Patch Set: Merge fix from https://codereview.chromium.org/2663163004. This is temporary Created 3 years, 10 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/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index f525808c5e5f271c1d329e677de2cea3d1933c35..4b1efcedaf645740243ddba2feb6d65f2f8a5235 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -254,6 +254,7 @@ class LocationBarView : public LocationBar,
private:
using ContentSettingViews = std::vector<ContentSettingImageView*>;
+ friend class ContentSettingBubbleDialogTest;
friend class PageActionImageView;
friend class PageActionWithBadgeView;
using PageActions = std::vector<ExtensionAction*>;
@@ -361,6 +362,8 @@ class LocationBarView : public LocationBar,
ExtensionAction* GetVisiblePageAction(size_t index) override;
void TestPageActionPressed(size_t index) override;
bool GetBookmarkStarVisibility() override;
+ int ContentSettingImageModelCount() override;
+ ContentSettingImageModel* GetContentSettingImageModel(size_t index) override;
// views::View:
const char* GetClassName() const override;
@@ -392,6 +395,11 @@ class LocationBarView : public LocationBar,
// TemplateURLServiceObserver:
void OnTemplateURLServiceChanged() override;
+ // For a given ContentSettingImageModel, return the corresponding
+ // ContentSettingImageView.
+ ContentSettingImageView* GetContentSettingImageViewFromImageModel(
+ ContentSettingImageModel* image_model);
Peter Kasting 2017/02/06 21:14:25 Nit: Following convention in this file, place non-
+
// The Browser this LocationBarView is in. Note that at least
// chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser
// window, so this may be NULL.

Powered by Google App Engine
This is Rietveld 408576698