chromeos: Sync animation.

ash/launcher/launcher_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 
 #include "ash/launcher/app_list_button.h"
+#include "ash/launcher/app_placeholder_view.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_icon_observer.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_tooltip_manager.h"
 #include "ash/launcher/overflow_bubble.h"
 #include "ash/launcher/overflow_button.h"
 #include "ash/launcher/tabbed_launcher_button.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "base/auto_reset.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/border.h"
-#include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using ui::Animation;
 using views::View;
 
 namespace ash {
 namespace internal {
 
 // Default amount content is inset on the left edge.
-static const int kDefaultLeadingInset = 8;
+const int kDefaultLeadingInset = 8;
 
 // Minimum distance before drag starts.
-static const int kMinimumDragDistance = 8;
+const int kMinimumDragDistance = 8;
 
 // Size between the buttons.
-static const int kButtonSpacing = 4;
+const int kButtonSpacing = 4;
 
 namespace {
 
 // Custom FocusSearch used to navigate the launcher in the order items are in
 // the ViewModel.
 class LauncherFocusSearch : public views::FocusSearch {
  public:
   explicit LauncherFocusSearch(views::ViewModel* view_model)
       : FocusSearch(NULL, true, true),
         view_model_(view_model) {}
@@ skipping 103 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FadeInAnimationDelegate);
 };
 
 void ReflectItemStatus(const ash::LauncherItem& item,
                        LauncherButton* button) {
   switch (item.status) {
     case STATUS_CLOSED:
       button->ClearState(LauncherButton::STATE_ACTIVE);
       button->ClearState(LauncherButton::STATE_RUNNING);
       button->ClearState(LauncherButton::STATE_ATTENTION);
-      button->ClearState(LauncherButton::STATE_PENDING);
       break;
     case STATUS_RUNNING:
       button->ClearState(LauncherButton::STATE_ACTIVE);
       button->AddState(LauncherButton::STATE_RUNNING);
       button->ClearState(LauncherButton::STATE_ATTENTION);
-      button->ClearState(LauncherButton::STATE_PENDING);
       break;
     case STATUS_ACTIVE:
       button->AddState(LauncherButton::STATE_ACTIVE);
       button->ClearState(LauncherButton::STATE_RUNNING);
       button->ClearState(LauncherButton::STATE_ATTENTION);
-      button->ClearState(LauncherButton::STATE_PENDING);
       break;
     case STATUS_ATTENTION:
       button->ClearState(LauncherButton::STATE_ACTIVE);
       button->ClearState(LauncherButton::STATE_RUNNING);
       button->AddState(LauncherButton::STATE_ATTENTION);
-      button->ClearState(LauncherButton::STATE_PENDING);
-      break;
-    case STATUS_IS_PENDING:
-      button->ClearState(LauncherButton::STATE_ACTIVE);
-      button->ClearState(LauncherButton::STATE_RUNNING);
-      button->ClearState(LauncherButton::STATE_ATTENTION);
-      button->AddState(LauncherButton::STATE_PENDING);
       break;
   }
 }
 
 }  // namespace
 
 // AnimationDelegate used when inserting a new item. This steadily decreased the
 // opacity of the layer as the animation progress.
 class LauncherView::FadeOutAnimationDelegate
     : public views::BoundsAnimator::OwnedAnimationDelegate {
@@ skipping 298 matching lines @@
     case TYPE_APP_SHORTCUT:
     case TYPE_PLATFORM_APP:
     case TYPE_APP_PANEL: {
       LauncherButton* button = LauncherButton::Create(this, this);
       button->SetImage(item.image);
       ReflectItemStatus(item, button);
       view = button;
       break;
     }
 
+    case TYPE_APP_PLACEHOLDER:
+      view = new AppPlaceholderView;
+      break;
+
     case TYPE_APP_LIST: {
       // TODO(dave): turn this into a LauncherButton too.
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       AppListButton* button = new AppListButton(this, this);
       button->SetImage(
           views::CustomButton::BS_NORMAL,
           rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToImageSkia());
       button->SetImage(
           views::CustomButton::BS_HOT,
           rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).
@@ skipping 119 matching lines @@
 bool LauncherView::SameDragType(LauncherItemType typea,
                                 LauncherItemType typeb) const {
   switch (typea) {
     case TYPE_TABBED:
     case TYPE_APP_PANEL:
     case TYPE_PLATFORM_APP:
       return (typeb == TYPE_TABBED ||
           typeb == TYPE_APP_PANEL ||
           typeb == TYPE_PLATFORM_APP);
     case TYPE_APP_SHORTCUT:
+    case TYPE_APP_PLACEHOLDER:
     case TYPE_APP_LIST:
     case TYPE_BROWSER_SHORTCUT:
       return typeb == typea;
   }
   NOTREACHED();
   return false;
 }
 
 std::pair<int, int> LauncherView::GetDragRange(int index) {
   int min_index = -1;
@@ skipping 295 matching lines @@
   if (!delegate_)
     return string16();
   int view_index = view_model_->GetIndexOfView(view);
   // May be -1 while in the process of animating closed.
   if (view_index == -1)
     return string16();
 
   switch (model_->items()[view_index].type) {
     case TYPE_TABBED:
     case TYPE_APP_PANEL:
+    case TYPE_APP_PLACEHOLDER:
     case TYPE_APP_SHORTCUT:
     case TYPE_PLATFORM_APP:
       return delegate_->GetTitle(model_->items()[view_index]);
 
     case TYPE_APP_LIST:
       return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
 
     case TYPE_BROWSER_SHORTCUT:
       return l10n_util::GetStringUTF16(IDS_AURA_NEW_TAB);
   }
@@ skipping 41 matching lines @@
     case TYPE_BROWSER_SHORTCUT:
       // Click on browser icon is counted in app clicks.
       Shell::GetInstance()->delegate()->RecordUserMetricsAction(
           UMA_LAUNCHER_CLICK_ON_APP);
 
       if (event.flags() & ui::EF_CONTROL_DOWN)
         delegate_->CreateNewWindow();
       else
         delegate_->CreateNewTab();
       break;
+
+    case TYPE_APP_PLACEHOLDER:
+      // Do nothing.
+      break;
   }
 }
 
 void LauncherView::ShowContextMenuForView(views::View* source,
                                           const gfx::Point& point) {
   if (!delegate_)
     return;
 
   int view_index = view_model_->GetIndexOfView(source);
   if (view_index != -1 &&
@@ skipping 28 matching lines @@
   FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
                     OnLauncherIconPositionsChanged());
   PreferredSizeChanged();
 }
 
 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
 }
 
 }  // namespace internal
 }  // namespace ash