X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fash%2Fshelf%2Fshelf_view.cc;h=c1774e56f0daed084efc866b40e8895b05562faa;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=0fd7a01774cdd96990fabb58ba4de2be130a7933;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ash/shelf/shelf_view.cc b/src/ash/shelf/shelf_view.cc index 0fd7a01..c1774e5 100644 --- a/src/ash/shelf/shelf_view.cc +++ b/src/ash/shelf/shelf_view.cc @@ -141,20 +141,20 @@ class ShelfMenuModelAdapter : public views::MenuModelAdapter { explicit ShelfMenuModelAdapter(ShelfMenuModel* menu_model); // views::MenuModelAdapter: - virtual const gfx::FontList* GetLabelFontList(int command_id) const OVERRIDE; - virtual bool IsCommandEnabled(int id) const OVERRIDE; - virtual void GetHorizontalIconMargins(int id, - int icon_size, - int* left_margin, - int* right_margin) const OVERRIDE; - virtual bool GetForegroundColor(int command_id, - bool is_hovered, - SkColor* override_color) const OVERRIDE; - virtual bool GetBackgroundColor(int command_id, - bool is_hovered, - SkColor* override_color) const OVERRIDE; - virtual int GetMaxWidthForMenu(views::MenuItemView* menu) OVERRIDE; - virtual bool ShouldReserveSpaceForSubmenuIndicator() const OVERRIDE; + const gfx::FontList* GetLabelFontList(int command_id) const override; + bool IsCommandEnabled(int id) const override; + void GetHorizontalIconMargins(int id, + int icon_size, + int* left_margin, + int* right_margin) const override; + bool GetForegroundColor(int command_id, + bool is_hovered, + SkColor* override_color) const override; + bool GetBackgroundColor(int command_id, + bool is_hovered, + SkColor* override_color) const override; + int GetMaxWidthForMenu(views::MenuItemView* menu) override; + bool ShouldReserveSpaceForSubmenuIndicator() const override; private: ShelfMenuModel* menu_model_; @@ -225,16 +225,15 @@ class ShelfFocusSearch : public views::FocusSearch { explicit ShelfFocusSearch(views::ViewModel* view_model) : FocusSearch(NULL, true, true), view_model_(view_model) {} - virtual ~ShelfFocusSearch() {} + ~ShelfFocusSearch() override {} // views::FocusSearch overrides: - virtual View* FindNextFocusableView( - View* starting_view, - bool reverse, - Direction direction, - bool check_starting_view, - views::FocusTraversable** focus_traversable, - View** focus_traversable_view) OVERRIDE { + View* FindNextFocusableView(View* starting_view, + bool reverse, + Direction direction, + bool check_starting_view, + views::FocusTraversable** focus_traversable, + View** focus_traversable_view) override { int index = view_model_->GetIndexOfView(starting_view); if (index == -1) return view_model_->view_at(0); @@ -262,18 +261,18 @@ class ShelfFocusSearch : public views::FocusSearch { class FadeInAnimationDelegate : public gfx::AnimationDelegate { public: explicit FadeInAnimationDelegate(views::View* view) : view_(view) {} - virtual ~FadeInAnimationDelegate() {} + ~FadeInAnimationDelegate() override {} // AnimationDelegate overrides: - virtual void AnimationProgressed(const Animation* animation) OVERRIDE { + void AnimationProgressed(const Animation* animation) override { view_->layer()->SetOpacity(animation->GetCurrentValue()); view_->layer()->ScheduleDraw(); } - virtual void AnimationEnded(const Animation* animation) OVERRIDE { + void AnimationEnded(const Animation* animation) override { view_->layer()->SetOpacity(1.0f); view_->layer()->ScheduleDraw(); } - virtual void AnimationCanceled(const Animation* animation) OVERRIDE { + void AnimationCanceled(const Animation* animation) override { view_->layer()->SetOpacity(1.0f); view_->layer()->ScheduleDraw(); } @@ -318,18 +317,17 @@ class ShelfView::FadeOutAnimationDelegate : public gfx::AnimationDelegate { FadeOutAnimationDelegate(ShelfView* host, views::View* view) : shelf_view_(host), view_(view) {} - virtual ~FadeOutAnimationDelegate() {} + ~FadeOutAnimationDelegate() override {} // AnimationDelegate overrides: - virtual void AnimationProgressed(const Animation* animation) OVERRIDE { + void AnimationProgressed(const Animation* animation) override { view_->layer()->SetOpacity(1 - animation->GetCurrentValue()); view_->layer()->ScheduleDraw(); } - virtual void AnimationEnded(const Animation* animation) OVERRIDE { + void AnimationEnded(const Animation* animation) override { shelf_view_->OnFadeOutAnimationEnded(); } - virtual void AnimationCanceled(const Animation* animation) OVERRIDE { - } + void AnimationCanceled(const Animation* animation) override {} private: ShelfView* shelf_view_; @@ -347,13 +345,13 @@ class ShelfView::StartFadeAnimationDelegate : public gfx::AnimationDelegate { views::View* view) : shelf_view_(host), view_(view) {} - virtual ~StartFadeAnimationDelegate() {} + ~StartFadeAnimationDelegate() override {} // AnimationDelegate overrides: - virtual void AnimationEnded(const Animation* animation) OVERRIDE { + void AnimationEnded(const Animation* animation) override { shelf_view_->FadeIn(view_); } - virtual void AnimationCanceled(const Animation* animation) OVERRIDE { + void AnimationCanceled(const Animation* animation) override { view_->layer()->SetOpacity(1.0f); } @@ -462,7 +460,9 @@ gfx::Rect ShelfView::GetIdealBoundsOfItemIcon(ShelfID id) { index = last_visible_index_ + 1; const gfx::Rect& ideal_bounds(view_model_->ideal_bounds(index)); DCHECK_NE(TYPE_APP_LIST, model_->items()[index].type); - ShelfButton* button = static_cast(view_model_->view_at(index)); + views::View* view = view_model_->view_at(index); + CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName()); + ShelfButton* button = static_cast(view); gfx::Rect icon_bounds = button->GetIconBounds(); return gfx::Rect(GetMirroredXWithWidthInView( ideal_bounds.x() + icon_bounds.x(), icon_bounds.width()), @@ -1068,9 +1068,8 @@ bool ShelfView::HandleRipOffDrag(const ui::LocatedEvent& event) { int delta = CalculateShelfDistance(screen_location); if (delta > kRipOffDistance) { // Create a proxy view item which can be moved anywhere. - ShelfButton* button = static_cast(drag_view_); CreateDragIconProxy(event.root_location(), - button->GetImage(), + drag_view_->GetImage(), drag_view_, gfx::Vector2d(0, 0), kDragAndDropProxyScale); @@ -1152,8 +1151,7 @@ void ShelfView::FinalizeRipOffDrag(bool cancel) { // animation end the flag gets cleared if |snap_back_from_rip_off_view_| // is set. snap_back_from_rip_off_view_ = drag_view_; - ShelfButton* button = static_cast(drag_view_); - button->AddState(ShelfButton::STATE_HIDDEN); + drag_view_->AddState(ShelfButton::STATE_HIDDEN); // When a canceling drag model is happening, the view model is diverged // from the menu model and movements / animations should not be done. model_->Move(current_index, start_drag_index_); @@ -1528,6 +1526,7 @@ void ShelfView::ShelfItemChanged(int model_index, const ShelfItem& old_item) { case TYPE_PLATFORM_APP: case TYPE_DIALOG: case TYPE_APP_PANEL: { + CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName()); ShelfButton* button = static_cast(view); ReflectItemStatus(item, button); // The browser shortcut is currently not a "real" item and as such the @@ -1572,7 +1571,8 @@ void ShelfView::PointerPressedOnButton(views::View* view, if (view_model_->view_size() <= 1 || !item_delegate->IsDraggable()) return; // View is being deleted or not draggable, ignore request. - drag_view_ = view; + CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName()); + drag_view_ = static_cast(view); drag_origin_ = gfx::Point(event.x(), event.y()); UMA_HISTOGRAM_ENUMERATION("Ash.ShelfAlignmentUsage", layout_manager_->SelectValueForShelfAlignment( @@ -1866,6 +1866,7 @@ void ShelfView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { for (int index = 0; index < view_model_->view_size(); index++) { views::View* view = view_model_->view_at(index); if (view == snap_back_from_rip_off_view_) { + CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName()); ShelfButton* button = static_cast(view); button->ClearState(ShelfButton::STATE_HIDDEN); break;