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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 2668833003: DialogBrowserTest implementation to invoke Content settings bubble dialogs. (Closed)
Patch Set: Removed the 'deceptive content' enum element in favor of the new 'subresource filter' element 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 ToolbarModel* GetToolbarModel() override; 239 ToolbarModel* GetToolbarModel() override;
240 content::WebContents* GetWebContents() override; 240 content::WebContents* GetWebContents() override;
241 241
242 // ZoomEventManagerObserver: 242 // ZoomEventManagerObserver:
243 // Updates the view for the zoom icon when default zoom levels change. 243 // Updates the view for the zoom icon when default zoom levels change.
244 void OnDefaultZoomLevelChanged() override; 244 void OnDefaultZoomLevelChanged() override;
245 245
246 private: 246 private:
247 using ContentSettingViews = std::vector<ContentSettingImageView*>; 247 using ContentSettingViews = std::vector<ContentSettingImageView*>;
248 248
249 friend class ContentSettingBubbleDialogTest;
tapted 2017/02/15 01:44:25 (still fairly certain this isn't necessary)
kylix_rd 2017/02/15 16:42:59 Done.
249 friend class PageActionImageView; 250 friend class PageActionImageView;
250 friend class PageActionWithBadgeView; 251 friend class PageActionWithBadgeView;
251 using PageActions = std::vector<ExtensionAction*>; 252 using PageActions = std::vector<ExtensionAction*>;
252 using PageActionViews = std::vector<std::unique_ptr<PageActionWithBadgeView>>; 253 using PageActionViews = std::vector<std::unique_ptr<PageActionWithBadgeView>>;
253 254
254 // Helper for GetMinimumWidth(). Calculates the incremental minimum width 255 // Helper for GetMinimumWidth(). Calculates the incremental minimum width
255 // |view| should add to the trailing width after the omnibox. 256 // |view| should add to the trailing width after the omnibox.
256 int IncrementalMinimumWidth(views::View* view) const; 257 int IncrementalMinimumWidth(views::View* view) const;
257 258
258 // The border color, drawn on top of the toolbar. 259 // The border color, drawn on top of the toolbar.
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 const OmniboxView* GetOmniboxView() const override; 350 const OmniboxView* GetOmniboxView() const override;
350 LocationBarTesting* GetLocationBarForTesting() override; 351 LocationBarTesting* GetLocationBarForTesting() override;
351 352
352 // LocationBarTesting: 353 // LocationBarTesting:
353 int PageActionCount() override; 354 int PageActionCount() override;
354 int PageActionVisibleCount() override; 355 int PageActionVisibleCount() override;
355 ExtensionAction* GetPageAction(size_t index) override; 356 ExtensionAction* GetPageAction(size_t index) override;
356 ExtensionAction* GetVisiblePageAction(size_t index) override; 357 ExtensionAction* GetVisiblePageAction(size_t index) override;
357 void TestPageActionPressed(size_t index) override; 358 void TestPageActionPressed(size_t index) override;
358 bool GetBookmarkStarVisibility() override; 359 bool GetBookmarkStarVisibility() override;
360 bool TestContentSettingImagePressed(size_t index) override;
359 361
360 // views::View: 362 // views::View:
361 const char* GetClassName() const override; 363 const char* GetClassName() const override;
362 void OnBoundsChanged(const gfx::Rect& previous_bounds) override; 364 void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
363 void OnFocus() override; 365 void OnFocus() override;
364 void OnPaint(gfx::Canvas* canvas) override; 366 void OnPaint(gfx::Canvas* canvas) override;
365 void OnPaintBorder(gfx::Canvas* canvas) override; 367 void OnPaintBorder(gfx::Canvas* canvas) override;
366 368
367 // views::DragController: 369 // views::DragController:
368 void WriteDragDataForView(View* sender, 370 void WriteDragDataForView(View* sender,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 BooleanPrefMember edit_bookmarks_enabled_; 461 BooleanPrefMember edit_bookmarks_enabled_;
460 462
461 // This is a debug state variable that stores if the WebContents was null 463 // This is a debug state variable that stores if the WebContents was null
462 // during the last RefreshPageAction. 464 // during the last RefreshPageAction.
463 bool web_contents_null_at_last_refresh_; 465 bool web_contents_null_at_last_refresh_;
464 466
465 DISALLOW_COPY_AND_ASSIGN(LocationBarView); 467 DISALLOW_COPY_AND_ASSIGN(LocationBarView);
466 }; 468 };
467 469
468 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 470 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698