| OLD | NEW |
| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 views::Widget* CreateViewsBubble( | 114 views::Widget* CreateViewsBubble( |
| 115 views::BubbleDelegateView* bubble_delegate) override; | 115 views::BubbleDelegateView* bubble_delegate) override; |
| 116 PageActionImageView* CreatePageActionImageView( | 116 PageActionImageView* CreatePageActionImageView( |
| 117 LocationBarView* owner, | 117 LocationBarView* owner, |
| 118 ExtensionAction* action) override; | 118 ExtensionAction* action) override; |
| 119 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate() | 119 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate() |
| 120 override; | 120 override; |
| 121 void ShowWebsiteSettings( | 121 void ShowWebsiteSettings( |
| 122 content::WebContents* web_contents, | 122 content::WebContents* web_contents, |
| 123 const GURL& url, | 123 const GURL& url, |
| 124 const SecurityStateModel::SecurityInfo& security_info) override; | 124 const security_state::SecurityStateModel::SecurityInfo& security_info) |
| 125 override; |
| 125 | 126 |
| 126 // CommandObserver: | 127 // CommandObserver: |
| 127 void EnabledStateChangedForCommand(int id, bool enabled) override; | 128 void EnabledStateChangedForCommand(int id, bool enabled) override; |
| 128 | 129 |
| 129 // views::ButtonListener: | 130 // views::ButtonListener: |
| 130 void ButtonPressed(views::Button* sender, const ui::Event& event) override; | 131 void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
| 131 | 132 |
| 132 // views::WidgetObserver: | 133 // views::WidgetObserver: |
| 133 void OnWidgetActivationChanged(views::Widget* widget, bool active) override; | 134 void OnWidgetActivationChanged(views::Widget* widget, bool active) override; |
| 134 | 135 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 | 219 |
| 219 // The display mode used when laying out the toolbar. | 220 // The display mode used when laying out the toolbar. |
| 220 DisplayMode display_mode_; | 221 DisplayMode display_mode_; |
| 221 | 222 |
| 222 content::NotificationRegistrar registrar_; | 223 content::NotificationRegistrar registrar_; |
| 223 | 224 |
| 224 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 225 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 225 }; | 226 }; |
| 226 | 227 |
| 227 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ | 228 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ |
| OLD | NEW |