| 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_BROWSER_ACTIONS_CONTAINER_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 |
| 10 #include "base/macros.h" |
| 8 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
| 9 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 12 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
| 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 13 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
| 11 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h" | 14 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h" |
| 12 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" | 15 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" |
| 13 #include "chrome/browser/ui/views/toolbar/chevron_menu_button.h" | 16 #include "chrome/browser/ui/views/toolbar/chevron_menu_button.h" |
| 14 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" | 17 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" |
| 15 #include "ui/gfx/animation/animation_delegate.h" | 18 #include "ui/gfx/animation/animation_delegate.h" |
| 16 #include "ui/gfx/animation/slide_animation.h" | 19 #include "ui/gfx/animation/slide_animation.h" |
| 17 #include "ui/gfx/animation/tween.h" | 20 #include "ui/gfx/animation/tween.h" |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 // The class that registers for keyboard shortcuts for extension commands. | 351 // The class that registers for keyboard shortcuts for extension commands. |
| 349 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; | 352 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; |
| 350 | 353 |
| 351 // The extension bubble that is actively showing, if any. | 354 // The extension bubble that is actively showing, if any. |
| 352 views::BubbleDelegateView* active_bubble_; | 355 views::BubbleDelegateView* active_bubble_; |
| 353 | 356 |
| 354 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); | 357 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); |
| 355 }; | 358 }; |
| 356 | 359 |
| 357 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ | 360 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ |
| OLD | NEW |