diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 18:35:54 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 18:35:54 +0000 |
| commit | fb6de399a7eead8338e4f49920feed47d122fec3 (patch) | |
| tree | ce27a7a6d26e6e71709f5a58a4b5f00d39f80df9 /chrome/browser/views/dropdown_bar_host.cc | |
| parent | f2f0a0b643f0edac8b346d2d53957d2a239699d0 (diff) | |
| download | chromium_src-fb6de399a7eead8338e4f49920feed47d122fec3.zip chromium_src-fb6de399a7eead8338e4f49920feed47d122fec3.tar.gz chromium_src-fb6de399a7eead8338e4f49920feed47d122fec3.tar.bz2 | |
Simplified the api by replacing them with single Show(false) call and cleaned up linux/mac code.
BUG=22036
TEST=None
Review URL: http://codereview.chromium.org/523125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/dropdown_bar_host.cc')
| -rw-r--r-- | chrome/browser/views/dropdown_bar_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/dropdown_bar_host.cc b/chrome/browser/views/dropdown_bar_host.cc index ee647d25..a921b95 100644 --- a/chrome/browser/views/dropdown_bar_host.cc +++ b/chrome/browser/views/dropdown_bar_host.cc @@ -58,12 +58,12 @@ DropdownBarHost::~DropdownBarHost() { focus_tracker_.reset(NULL); } -void DropdownBarHost::Show() { +void DropdownBarHost::Show(bool animate) { // Stores the currently focused view, and tracks focus changes so that we can // restore focus when the dropdown widget is closed. focus_tracker_.reset(new views::ExternalFocusTracker(view_, focus_manager_)); - if (disable_animations_during_testing_) { + if (!animate || disable_animations_during_testing_) { animation_->Reset(1); AnimationProgressed(animation_.get()); } else { |