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

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: rebase 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
« no previous file with comments | « ash/launcher/overflow_bubble.cc ('k') | ash/system/tray/tray_bubble_wrapper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 285 }
286 } 286 }
287 287
288 void TrayBackgroundView::InitializeBubbleAnimations( 288 void TrayBackgroundView::InitializeBubbleAnimations(
289 views::Widget* bubble_widget) { 289 views::Widget* bubble_widget) {
290 ash::SetWindowVisibilityAnimationType( 290 ash::SetWindowVisibilityAnimationType(
291 bubble_widget->GetNativeWindow(), 291 bubble_widget->GetNativeWindow(),
292 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); 292 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
293 ash::SetWindowVisibilityAnimationTransition( 293 ash::SetWindowVisibilityAnimationTransition(
294 bubble_widget->GetNativeWindow(), 294 bubble_widget->GetNativeWindow(),
295 ash::ANIMATE_BOTH); 295 ash::ANIMATE_HIDE);
296 ash::SetWindowVisibilityAnimationDuration( 296 ash::SetWindowVisibilityAnimationDuration(
297 bubble_widget->GetNativeWindow(), 297 bubble_widget->GetNativeWindow(),
298 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS)); 298 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS));
299 } 299 }
300 300
301 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const { 301 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const {
302 return ash::Shell::GetContainer( 302 return ash::Shell::GetContainer(
303 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(), 303 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(),
304 ash::internal::kShellWindowId_SettingBubbleContainer); 304 ash::internal::kShellWindowId_SettingBubbleContainer);
305 } 305 }
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 views::TrayBubbleView* bubble_view) { 367 views::TrayBubbleView* bubble_view) {
368 aura::RootWindow* root_window = 368 aura::RootWindow* root_window =
369 bubble_view->GetWidget()->GetNativeView()->GetRootWindow(); 369 bubble_view->GetWidget()->GetNativeView()->GetRootWindow();
370 ash::internal::ShelfLayoutManager* shelf = 370 ash::internal::ShelfLayoutManager* shelf =
371 ash::GetRootWindowController(root_window)->shelf(); 371 ash::GetRootWindowController(root_window)->shelf();
372 bubble_view->SetPaintArrow(shelf->IsVisible()); 372 bubble_view->SetPaintArrow(shelf->IsVisible());
373 } 373 }
374 374
375 } // namespace internal 375 } // namespace internal
376 } // namespace ash 376 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/overflow_bubble.cc ('k') | ash/system/tray/tray_bubble_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698