OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" | 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/themes/theme_service.h" | 10 #include "chrome/browser/themes/theme_service.h" |
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
840 // time period that the animation is running. | 840 // time period that the animation is running. |
841 settings_button_->SetVisible(true); | 841 settings_button_->SetVisible(true); |
842 | 842 |
843 if (settings_button_animator_.get()) { | 843 if (settings_button_animator_.get()) { |
844 if (settings_button_animator_->IsShowing()) | 844 if (settings_button_animator_->IsShowing()) |
845 settings_button_animator_->Reset(); | 845 settings_button_animator_->Reset(); |
846 } else { | 846 } else { |
847 settings_button_animator_.reset(new ui::SlideAnimation(this)); | 847 settings_button_animator_.reset(new ui::SlideAnimation(this)); |
848 settings_button_animator_->SetTweenType(ui::Tween::LINEAR); | 848 settings_button_animator_->SetTweenType(ui::Tween::LINEAR); |
849 settings_button_animator_->SetSlideDuration( | 849 settings_button_animator_->SetSlideDuration( |
850 kUpdateSettingsVisibilityAnimationMs); | 850 PanelManager::AdjustTimeInterval( |
| 851 kUpdateSettingsVisibilityAnimationMs)); |
851 } | 852 } |
852 | 853 |
853 settings_button_animator_->Show(); | 854 settings_button_animator_->Show(); |
854 } | 855 } |
855 | 856 |
856 bool PanelBrowserFrameView::EnsureSettingsMenuCreated() { | 857 bool PanelBrowserFrameView::EnsureSettingsMenuCreated() { |
857 if (settings_menu_runner_.get()) | 858 if (settings_menu_runner_.get()) |
858 return true; | 859 return true; |
859 | 860 |
860 const Extension* extension = panel_browser_view_->panel()->GetExtension(); | 861 const Extension* extension = panel_browser_view_->panel()->GetExtension(); |
861 if (!extension) | 862 if (!extension) |
862 return false; | 863 return false; |
863 | 864 |
864 settings_menu_model_.reset( | 865 settings_menu_model_.reset( |
865 new PanelSettingsMenuModel(panel_browser_view_->panel())); | 866 new PanelSettingsMenuModel(panel_browser_view_->panel())); |
866 settings_menu_adapter_.reset( | 867 settings_menu_adapter_.reset( |
867 new views::MenuModelAdapter(settings_menu_model_.get())); | 868 new views::MenuModelAdapter(settings_menu_model_.get())); |
868 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); | 869 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); |
869 settings_menu_adapter_->BuildMenu(settings_menu_); | 870 settings_menu_adapter_->BuildMenu(settings_menu_); |
870 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); | 871 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); |
871 return true; | 872 return true; |
872 } | 873 } |
OLD | NEW |