Chromium Code Reviews| Index: chrome/browser/ui/toolbar/toolbar_actions_bar.h |
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.h b/chrome/browser/ui/toolbar/toolbar_actions_bar.h |
| index 8bea70d04804b35c48d152e4fe808f94348222ca..6224bf567cfacf76bf6d3e631467d612e6108d04 100644 |
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h |
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h |
| @@ -67,6 +67,12 @@ class ToolbarActionsBar : public extensions::ExtensionToolbarModel::Observer { |
| DRAG_TO_MAIN, |
| }; |
| + enum HighlightType { |
| + HIGHLIGHT_NONE, |
| + HIGHLIGHT_INFO, |
| + HIGHLIGHT_WARNING, |
| + }; |
| + |
| ToolbarActionsBar(ToolbarActionsBarDelegate* delegate, |
| Browser* browser, |
| ToolbarActionsBar* main_bar); |
| @@ -103,6 +109,9 @@ class ToolbarActionsBar : public extensions::ExtensionToolbarModel::Observer { |
| // underlying order in the case of actions being popped out to show a popup. |
| std::vector<ToolbarActionViewController*> GetActions() const; |
| + // Returns the current highlight type. |
| + HighlightType GetHighlightType() const; |
|
Peter Kasting
2015/07/23 18:29:07
I think this declaration is a leftover?
Devlin
2015/07/23 20:39:35
Whoops, removed.
|
| + |
| // Creates the toolbar actions. |
| void CreateActions(); |
| @@ -165,6 +174,10 @@ class ToolbarActionsBar : public extensions::ExtensionToolbarModel::Observer { |
| return suppress_animation_ || disable_animations_for_testing_; |
| } |
| bool is_highlighting() const { return model_ && model_->is_highlighting(); } |
| + extensions::ExtensionToolbarModel::HighlightType highlight_type() const { |
| + return model_ ? model_->highlight_type() |
| + : extensions::ExtensionToolbarModel::HIGHLIGHT_NONE; |
| + } |
| const PlatformSettings& platform_settings() const { |
| return platform_settings_; |
| } |