| 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_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ | 5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ |
| 6 #define CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ | 6 #define CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 // for incognito. | 111 // for incognito. |
| 112 bool ShouldDisplayBrowserAction(const extensions::Extension* extension); | 112 bool ShouldDisplayBrowserAction(const extensions::Extension* extension); |
| 113 | 113 |
| 114 // ExtensionToolbarModel::Observer implementation. | 114 // ExtensionToolbarModel::Observer implementation. |
| 115 virtual void BrowserActionAdded(const extensions::Extension* extension, | 115 virtual void BrowserActionAdded(const extensions::Extension* extension, |
| 116 int index) OVERRIDE; | 116 int index) OVERRIDE; |
| 117 virtual void BrowserActionRemoved( | 117 virtual void BrowserActionRemoved( |
| 118 const extensions::Extension* extension) OVERRIDE; | 118 const extensions::Extension* extension) OVERRIDE; |
| 119 virtual void BrowserActionMoved(const extensions::Extension* extension, | 119 virtual void BrowserActionMoved(const extensions::Extension* extension, |
| 120 int index) OVERRIDE; | 120 int index) OVERRIDE; |
| 121 virtual void BrowserActionShowPopup( |
| 122 const extensions::Extension* extension) OVERRIDE; |
| 121 virtual void ModelLoaded() OVERRIDE; | 123 virtual void ModelLoaded() OVERRIDE; |
| 122 | 124 |
| 123 // gfx::AnimationDelegate implementation. | 125 // gfx::AnimationDelegate implementation. |
| 124 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; | 126 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; |
| 125 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; | 127 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; |
| 126 | 128 |
| 127 // SimpleMenuModel::Delegate implementation. | 129 // SimpleMenuModel::Delegate implementation. |
| 128 // In our case, |command_id| is be the index into the model's extension list. | 130 // In our case, |command_id| is be the index into the model's extension list. |
| 129 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; | 131 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; |
| 130 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; | 132 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 ui::GtkSignalRegistrar signals_; | 225 ui::GtkSignalRegistrar signals_; |
| 224 | 226 |
| 225 content::NotificationRegistrar registrar_; | 227 content::NotificationRegistrar registrar_; |
| 226 | 228 |
| 227 base::WeakPtrFactory<BrowserActionsToolbarGtk> weak_factory_; | 229 base::WeakPtrFactory<BrowserActionsToolbarGtk> weak_factory_; |
| 228 | 230 |
| 229 DISALLOW_COPY_AND_ASSIGN(BrowserActionsToolbarGtk); | 231 DISALLOW_COPY_AND_ASSIGN(BrowserActionsToolbarGtk); |
| 230 }; | 232 }; |
| 231 | 233 |
| 232 #endif // CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ | 234 #endif // CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ |
| OLD | NEW |