| OLD | NEW |
| 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_TOOLBAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 // Overridden from AccessiblePaneView | 85 // Overridden from AccessiblePaneView |
| 86 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; | 86 virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; |
| 87 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; | 87 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
| 88 | 88 |
| 89 // Overridden from views::ViewMenuDelegate: | 89 // Overridden from views::ViewMenuDelegate: |
| 90 virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; | 90 virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; |
| 91 | 91 |
| 92 // Overridden from LocationBarView::Delegate: | 92 // Overridden from LocationBarView::Delegate: |
| 93 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; | 93 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; |
| 94 virtual InstantController* GetInstant() OVERRIDE; | 94 virtual InstantController* GetInstant() OVERRIDE; |
| 95 virtual BrowserShowContentRelated* GetBrowserShowContentRelated() OVERRIDE; |
| 96 virtual BrowserShowPageInfo* GetBrowserShowPageInfo() OVERRIDE; |
| 97 virtual views::Widget* CreateViewsBubble( |
| 98 views::BubbleDelegateView* bubble_delegate) OVERRIDE; |
| 99 virtual PageActionImageView* CreatePageActionImageView( |
| 100 LocationBarView* owner, ExtensionAction* action) OVERRIDE; |
| 95 virtual void OnInputInProgress(bool in_progress) OVERRIDE; | 101 virtual void OnInputInProgress(bool in_progress) OVERRIDE; |
| 96 | 102 |
| 97 // Overridden from CommandUpdater::CommandObserver: | 103 // Overridden from CommandUpdater::CommandObserver: |
| 98 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; | 104 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; |
| 99 | 105 |
| 100 // Overridden from views::BaseButton::ButtonListener: | 106 // Overridden from views::BaseButton::ButtonListener: |
| 101 virtual void ButtonPressed(views::Button* sender, const views::Event& event) | 107 virtual void ButtonPressed(views::Button* sender, const views::Event& event) |
| 102 OVERRIDE; | 108 OVERRIDE; |
| 103 | 109 |
| 104 // Overridden from content::NotificationObserver: | 110 // Overridden from content::NotificationObserver: |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 | 208 |
| 203 // A list of listeners to call when the menu opens. | 209 // A list of listeners to call when the menu opens. |
| 204 ObserverList<views::MenuListener> menu_listeners_; | 210 ObserverList<views::MenuListener> menu_listeners_; |
| 205 | 211 |
| 206 content::NotificationRegistrar registrar_; | 212 content::NotificationRegistrar registrar_; |
| 207 | 213 |
| 208 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); | 214 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); |
| 209 }; | 215 }; |
| 210 | 216 |
| 211 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ | 217 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ |
| OLD | NEW |