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

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

Issue 1961001: Refactors animation to allow for cleaner subclassing. I'm doing this (Closed)
Patch Set: Incorporated review feedback Created 10 years, 7 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 // including the controls (chevron if visible and resize gripper). 421 // including the controls (chevron if visible and resize gripper).
422 int IconCountToWidth(int icons) const; 422 int IconCountToWidth(int icons) const;
423 423
424 // Returns the absolute minimum size you can shrink the container down to and 424 // Returns the absolute minimum size you can shrink the container down to and
425 // still show it. We account for the chevron and the resize gripper, but not 425 // still show it. We account for the chevron and the resize gripper, but not
426 // all the padding that we normally show if there are icons. 426 // all the padding that we normally show if there are icons.
427 int ContainerMinSize() const; 427 int ContainerMinSize() const;
428 428
429 // Animate to the target value (unless testing, in which case we go straight 429 // Animate to the target value (unless testing, in which case we go straight
430 // to the target size). 430 // to the target size).
431 void Animate(SlideAnimation::TweenType tween_type, int target_size); 431 void Animate(Tween::Type type, int target_size);
432 432
433 // Returns true if this extension should be shown in this toolbar. This can 433 // Returns true if this extension should be shown in this toolbar. This can
434 // return false if we are in an incognito window and the extension is disabled 434 // return false if we are in an incognito window and the extension is disabled
435 // for incognito. 435 // for incognito.
436 bool ShouldDisplayBrowserAction(Extension* extension); 436 bool ShouldDisplayBrowserAction(Extension* extension);
437 437
438 // The vector of browser actions (icons/image buttons for each action). Note 438 // The vector of browser actions (icons/image buttons for each action). Note
439 // that not every BrowserAction in the ToolbarModel will necessarily be in 439 // that not every BrowserAction in the ToolbarModel will necessarily be in
440 // this collection. Some extensions may be disabled in incognito windows. 440 // this collection. Some extensions may be disabled in incognito windows.
441 BrowserActionViews browser_action_views_; 441 BrowserActionViews browser_action_views_;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 494
495 ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_; 495 ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
496 496
497 // Handles delayed showing of the overflow menu when hovering. 497 // Handles delayed showing of the overflow menu when hovering.
498 ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_; 498 ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;
499 499
500 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 500 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
501 }; 501 };
502 502
503 #endif // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 503 #endif // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/bookmark_bar_view.cc ('k') | chrome/browser/views/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698