Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(593)

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.h

Issue 1246643004: [Extensions UI] Highlight toolbar extensions when the redesign bubble is active (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "chrome/browser/extensions/extension_keybinding_registry.h" 9 #include "chrome/browser/extensions/extension_keybinding_registry.h"
10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // Overridden from gfx::AnimationDelegate: 225 // Overridden from gfx::AnimationDelegate:
226 void AnimationProgressed(const gfx::Animation* animation) override; 226 void AnimationProgressed(const gfx::Animation* animation) override;
227 void AnimationCanceled(const gfx::Animation* animation) override; 227 void AnimationCanceled(const gfx::Animation* animation) override;
228 void AnimationEnded(const gfx::Animation* animation) override; 228 void AnimationEnded(const gfx::Animation* animation) override;
229 229
230 // Overridden from ToolbarActionView::Delegate: 230 // Overridden from ToolbarActionView::Delegate:
231 content::WebContents* GetCurrentWebContents() override; 231 content::WebContents* GetCurrentWebContents() override;
232 bool ShownInsideMenu() const override; 232 bool ShownInsideMenu() const override;
233 void OnToolbarActionViewDragDone() override; 233 void OnToolbarActionViewDragDone() override;
234 views::MenuButton* GetOverflowReferenceView() override; 234 views::MenuButton* GetOverflowReferenceView() override;
235 void OnMouseEnteredToolbarActionView() override;
235 236
236 // ToolbarActionsBarDelegate: 237 // ToolbarActionsBarDelegate:
237 void AddViewForAction(ToolbarActionViewController* action, 238 void AddViewForAction(ToolbarActionViewController* action,
238 size_t index) override; 239 size_t index) override;
239 void RemoveViewForAction(ToolbarActionViewController* action) override; 240 void RemoveViewForAction(ToolbarActionViewController* action) override;
240 void RemoveAllViews() override; 241 void RemoveAllViews() override;
241 void Redraw(bool order_changed) override; 242 void Redraw(bool order_changed) override;
242 void ResizeAndAnimate(gfx::Tween::Type tween_type, 243 void ResizeAndAnimate(gfx::Tween::Type tween_type,
243 int target_width, 244 int target_width,
244 bool suppress_chevron) override; 245 bool suppress_chevron) override;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 int container_width_; 308 int container_width_;
308 309
309 // The resize area for the container. 310 // The resize area for the container.
310 views::ResizeArea* resize_area_; 311 views::ResizeArea* resize_area_;
311 312
312 // The chevron for accessing the overflow items. Can be NULL when in overflow 313 // The chevron for accessing the overflow items. Can be NULL when in overflow
313 // mode or if the toolbar is permanently suppressing the chevron menu. 314 // mode or if the toolbar is permanently suppressing the chevron menu.
314 ChevronMenuButton* chevron_; 315 ChevronMenuButton* chevron_;
315 316
316 // The painter used when we are highlighting a subset of extensions. 317 // The painter used when we are highlighting a subset of extensions.
317 scoped_ptr<views::Painter> highlight_painter_; 318 scoped_ptr<views::Painter> info_highlight_painter_;
319 scoped_ptr<views::Painter> warning_highlight_painter_;
318 320
319 // The animation that happens when the container snaps to place. 321 // The animation that happens when the container snaps to place.
320 scoped_ptr<gfx::SlideAnimation> resize_animation_; 322 scoped_ptr<gfx::SlideAnimation> resize_animation_;
321 323
322 // Don't show the chevron while animating. 324 // Don't show the chevron while animating.
323 bool suppress_chevron_; 325 bool suppress_chevron_;
324 326
325 // True if the container has been added to the parent view. 327 // True if the container has been added to the parent view.
326 bool added_to_view_; 328 bool added_to_view_;
327 329
(...skipping 18 matching lines...) Expand all
346 348
347 // The extension bubble that is actively showing, if any. 349 // The extension bubble that is actively showing, if any.
348 views::BubbleDelegateView* active_bubble_; 350 views::BubbleDelegateView* active_bubble_;
349 351
350 base::ObserverList<BrowserActionsContainerObserver> observers_; 352 base::ObserverList<BrowserActionsContainerObserver> observers_;
351 353
352 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 354 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
353 }; 355 };
354 356
355 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 357 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_bar.cc ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698