| 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_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 // This is used for post-install visual feedback. The page_action icon is | 123 // This is used for post-install visual feedback. The page_action icon is |
| 124 // briefly shown even if it hasn't been enabled by its extension. | 124 // briefly shown even if it hasn't been enabled by its extension. |
| 125 bool preview_enabled_; | 125 bool preview_enabled_; |
| 126 | 126 |
| 127 // The current popup and the button it came from. NULL if no popup. | 127 // The current popup and the button it came from. NULL if no popup. |
| 128 ExtensionPopup* popup_; | 128 ExtensionPopup* popup_; |
| 129 | 129 |
| 130 content::NotificationRegistrar registrar_; | 130 content::NotificationRegistrar registrar_; |
| 131 | 131 |
| 132 // The extension keybinding accelerator this page action is listening for (to | 132 // The extension command accelerator this page action is listening for (to |
| 133 // show the popup). | 133 // show the popup). |
| 134 scoped_ptr<ui::Accelerator> keybinding_; | 134 scoped_ptr<ui::Accelerator> page_action_keybinding_; |
| 135 // The extension command accelerator this script badge is listening for (to |
| 136 // show the popup). |
| 137 scoped_ptr<ui::Accelerator> script_badge_keybinding_; |
| 135 | 138 |
| 136 scoped_ptr<views::MenuRunner> menu_runner_; | 139 scoped_ptr<views::MenuRunner> menu_runner_; |
| 137 | 140 |
| 138 // Fade-in animation for the icon with observer scoped to this. | 141 // Fade-in animation for the icon with observer scoped to this. |
| 139 ExtensionAction::IconAnimation::ScopedObserver | 142 ExtensionAction::IconAnimation::ScopedObserver |
| 140 scoped_icon_animation_observer_; | 143 scoped_icon_animation_observer_; |
| 141 | 144 |
| 142 DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView); | 145 DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView); |
| 143 }; | 146 }; |
| 144 | 147 |
| 145 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ | 148 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_ |
| OLD | NEW |