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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_view.h

Issue 1870533002: Convert ContentSettingBubbleContents to a BubbleDialogDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac views Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TOOLBAR_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 // views::MenuButtonListener: 106 // views::MenuButtonListener:
107 void OnMenuButtonClicked(views::MenuButton* source, 107 void OnMenuButtonClicked(views::MenuButton* source,
108 const gfx::Point& point, 108 const gfx::Point& point,
109 const ui::Event* event) override; 109 const ui::Event* event) override;
110 110
111 // LocationBarView::Delegate: 111 // LocationBarView::Delegate:
112 content::WebContents* GetWebContents() override; 112 content::WebContents* GetWebContents() override;
113 ToolbarModel* GetToolbarModel() override; 113 ToolbarModel* GetToolbarModel() override;
114 const ToolbarModel* GetToolbarModel() const override; 114 const ToolbarModel* GetToolbarModel() const override;
115 views::Widget* CreateViewsBubble(
116 views::BubbleDelegateView* bubble_delegate) override;
117 PageActionImageView* CreatePageActionImageView( 115 PageActionImageView* CreatePageActionImageView(
118 LocationBarView* owner, 116 LocationBarView* owner,
119 ExtensionAction* action) override; 117 ExtensionAction* action) override;
120 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate() 118 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate()
121 override; 119 override;
122 void ShowWebsiteSettings( 120 void ShowWebsiteSettings(
123 content::WebContents* web_contents, 121 content::WebContents* web_contents,
124 const GURL& url, 122 const GURL& url,
125 const security_state::SecurityStateModel::SecurityInfo& security_info) 123 const security_state::SecurityStateModel::SecurityInfo& security_info)
126 override; 124 override;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 214
217 // The display mode used when laying out the toolbar. 215 // The display mode used when laying out the toolbar.
218 const DisplayMode display_mode_; 216 const DisplayMode display_mode_;
219 217
220 content::NotificationRegistrar registrar_; 218 content::NotificationRegistrar registrar_;
221 219
222 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 220 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
223 }; 221 };
224 222
225 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 223 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698