Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1032)

Side by Side Diff: ash/system/tray/tray_background_view.cc

Issue 11341034: Animation changed to fade out on Launcher related bubbles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/tray/tray_background_view.h" 5 #include "ash/system/tray/tray_background_view.h"
6 6
7 #include "ash/launcher/background_animator.h" 7 #include "ash/launcher/background_animator.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 } 277 }
278 } 278 }
279 279
280 void TrayBackgroundView::InitializeBubbleAnimations( 280 void TrayBackgroundView::InitializeBubbleAnimations(
281 views::Widget* bubble_widget) { 281 views::Widget* bubble_widget) {
282 ash::SetWindowVisibilityAnimationType( 282 ash::SetWindowVisibilityAnimationType(
283 bubble_widget->GetNativeWindow(), 283 bubble_widget->GetNativeWindow(),
284 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); 284 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
285 ash::SetWindowVisibilityAnimationTransition( 285 ash::SetWindowVisibilityAnimationTransition(
286 bubble_widget->GetNativeWindow(), 286 bubble_widget->GetNativeWindow(),
287 ash::ANIMATE_BOTH); 287 ash::ANIMATE_HIDE);
288 ash::SetWindowVisibilityAnimationDuration( 288 ash::SetWindowVisibilityAnimationDuration(
289 bubble_widget->GetNativeWindow(), 289 bubble_widget->GetNativeWindow(),
290 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS)); 290 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS));
291 } 291 }
292 292
293 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const { 293 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const {
294 return ash::Shell::GetContainer( 294 return ash::Shell::GetContainer(
295 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(), 295 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(),
296 ash::internal::kShellWindowId_SettingBubbleContainer); 296 ash::internal::kShellWindowId_SettingBubbleContainer);
297 } 297 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 return TrayBubbleView::ANCHOR_ALIGNMENT_LEFT; 350 return TrayBubbleView::ANCHOR_ALIGNMENT_LEFT;
351 case SHELF_ALIGNMENT_RIGHT: 351 case SHELF_ALIGNMENT_RIGHT:
352 return TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT; 352 return TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT;
353 } 353 }
354 NOTREACHED(); 354 NOTREACHED();
355 return TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM; 355 return TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM;
356 } 356 }
357 357
358 } // namespace internal 358 } // namespace internal
359 } // namespace ash 359 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698