[ash-md] Added a delay between system menu default/detailed view transitions.

ash/common/system/tray/tray_details_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/common/system/tray/tray_details_view.h"
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_menu_button.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.h"
 #include "base/containers/adapters.h"
+#include "base/timer/timer.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
@@ skipping 420 matching lines @@
 }
 
 void TrayDetailsView::HandleButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
   NOTREACHED();
 }
 
 void TrayDetailsView::CreateExtraTitleRowButtons() {}
 
 void TrayDetailsView::TransitionToDefaultView() {
+  if (UseMd()) {
+    if (back_button_ && back_button_->HasFocus())
+      owner_->set_restore_focus(true);
+  } else {
+    if (title_row_ && title_row_->content() &&
+        title_row_->content()->HasFocus()) {
+      owner_->set_restore_focus(true);
+    }
+    DoTransitionToDefaultView();
+    return;
+  }
+
+  const int transition_delay =
+      GetTrayConstant(TRAY_POPUP_TRANSITION_TO_DEFAULT_DELAY);
+  if (transition_delay <= 0) {
+    DoTransitionToDefaultView();
+    return;
+  }
+
+  transition_delay_timer_.reset(new base::OneShotTimer());
+  transition_delay_timer_->Start(
+      FROM_HERE, base::TimeDelta::FromMilliseconds(transition_delay), this,
+      &TrayDetailsView::DoTransitionToDefaultView);
+}
+
+void TrayDetailsView::DoTransitionToDefaultView() {
+  transition_delay_timer_.reset();
+
   // Cache pointer to owner in this function scope. TrayDetailsView will be
   // deleted after called ShowDefaultView.
   SystemTrayItem* owner = owner_;
-  if (UseMd()) {
-    if (back_button_ && back_button_->HasFocus())
-      owner->set_restore_focus(true);
-  } else {
-    if (title_row_ && title_row_->content() &&
-        title_row_->content()->HasFocus()) {
-      owner->set_restore_focus(true);
-    }
-  }
   owner->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   owner->set_restore_focus(false);
 }
 
 views::Button* TrayDetailsView::CreateBackButton() {
   DCHECK(UseMd());
   SystemMenuButton* button = new SystemMenuButton(
       this, TrayPopupInkDropStyle::HOST_CENTERED, kSystemMenuArrowBackIcon,
       IDS_ASH_STATUS_TRAY_PREVIOUS_MENU);
   return button;
@@ skipping 50 matching lines @@
     if (index < child_count() - 1 && child_at(index + 1) != title_row_)
       scroll_border_->set_visible(true);
     else
       scroll_border_->set_visible(false);
   }
 
   views::View::OnPaintBorder(canvas);
 }
 
 }  // namespace ash