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

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

Issue 139013006: Revert 245031 "This CL" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1795/src/
Patch Set: Created 6 years, 11 months 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 | « no previous file | ash/wm/dock/docked_window_layout_manager.h » ('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/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 } 494 }
495 495
496 void TrayBackgroundView::InitializeBubbleAnimations( 496 void TrayBackgroundView::InitializeBubbleAnimations(
497 views::Widget* bubble_widget) { 497 views::Widget* bubble_widget) {
498 views::corewm::SetWindowVisibilityAnimationType( 498 views::corewm::SetWindowVisibilityAnimationType(
499 bubble_widget->GetNativeWindow(), 499 bubble_widget->GetNativeWindow(),
500 views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); 500 views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
501 views::corewm::SetWindowVisibilityAnimationTransition( 501 views::corewm::SetWindowVisibilityAnimationTransition(
502 bubble_widget->GetNativeWindow(), 502 bubble_widget->GetNativeWindow(),
503 views::corewm::ANIMATE_HIDE); 503 views::corewm::ANIMATE_HIDE);
504 views::corewm::SetWindowHideAnimationDuration( 504 views::corewm::SetWindowVisibilityAnimationDuration(
505 bubble_widget->GetNativeWindow(), 505 bubble_widget->GetNativeWindow(),
506 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS)); 506 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS));
507 } 507 }
508 508
509 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const { 509 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const {
510 return ash::Shell::GetContainer( 510 return ash::Shell::GetContainer(
511 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(), 511 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(),
512 ash::internal::kShellWindowId_SettingBubbleContainer); 512 ash::internal::kShellWindowId_SettingBubbleContainer);
513 } 513 }
514 514
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 ash::internal::ShelfLayoutManager* shelf = 625 ash::internal::ShelfLayoutManager* shelf =
626 ShelfLayoutManager::ForShelf(root_window); 626 ShelfLayoutManager::ForShelf(root_window);
627 bubble_view->SetArrowPaintType( 627 bubble_view->SetArrowPaintType(
628 (shelf && shelf->IsVisible()) ? 628 (shelf && shelf->IsVisible()) ?
629 views::BubbleBorder::PAINT_NORMAL : 629 views::BubbleBorder::PAINT_NORMAL :
630 views::BubbleBorder::PAINT_TRANSPARENT); 630 views::BubbleBorder::PAINT_TRANSPARENT);
631 } 631 }
632 632
633 } // namespace internal 633 } // namespace internal
634 } // namespace ash 634 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/dock/docked_window_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698