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

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

Issue 1314953009: Refactor WebsiteSettings to operate on a SecurityInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 3 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/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "base/prefs/pref_member.h" 10 #include "base/prefs/pref_member.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 content::WebContents* GetWebContents() override; 123 content::WebContents* GetWebContents() override;
124 ToolbarModel* GetToolbarModel() override; 124 ToolbarModel* GetToolbarModel() override;
125 const ToolbarModel* GetToolbarModel() const override; 125 const ToolbarModel* GetToolbarModel() const override;
126 views::Widget* CreateViewsBubble( 126 views::Widget* CreateViewsBubble(
127 views::BubbleDelegateView* bubble_delegate) override; 127 views::BubbleDelegateView* bubble_delegate) override;
128 PageActionImageView* CreatePageActionImageView( 128 PageActionImageView* CreatePageActionImageView(
129 LocationBarView* owner, 129 LocationBarView* owner,
130 ExtensionAction* action) override; 130 ExtensionAction* action) override;
131 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate() 131 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate()
132 override; 132 override;
133 void ShowWebsiteSettings(content::WebContents* web_contents, 133 void ShowWebsiteSettings(
134 const GURL& url, 134 content::WebContents* web_contents,
135 const content::SSLStatus& ssl) override; 135 const GURL& url,
136 const SecurityStateModel::SecurityInfo& security_info) override;
136 137
137 // CommandObserver: 138 // CommandObserver:
138 void EnabledStateChangedForCommand(int id, bool enabled) override; 139 void EnabledStateChangedForCommand(int id, bool enabled) override;
139 140
140 // views::ButtonListener: 141 // views::ButtonListener:
141 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 142 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
142 143
143 // views::WidgetObserver: 144 // views::WidgetObserver:
144 void OnWidgetActivationChanged(views::Widget* widget, bool active) override; 145 void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
145 146
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 253
253 // A list of listeners to call when the menu opens. 254 // A list of listeners to call when the menu opens.
254 base::ObserverList<views::MenuListener> menu_listeners_; 255 base::ObserverList<views::MenuListener> menu_listeners_;
255 256
256 content::NotificationRegistrar registrar_; 257 content::NotificationRegistrar registrar_;
257 258
258 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 259 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
259 }; 260 };
260 261
261 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 262 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698