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

Unified Diff: ash/desktop_background/desktop_background_view.cc

Issue 1900443002: Removes aura dependencies from WindowPositioner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nuke GetWorkAreaForWindowInParent and fix windows Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/default_user_wallpaper_delegate.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_view.cc
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index 1a915a280f8fde36c45c3602d779d6c9aa4718cd..57ead5126dad9690f7c0e33e75e5f0b9413b7eda 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -221,8 +221,8 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window,
desktop_widget->SetContentsView(
new LayerControlView(new DesktopBackgroundView()));
int animation_type = wallpaper_delegate->GetAnimationType();
- wm::SetWindowVisibilityAnimationType(
- desktop_widget->GetNativeView(), animation_type);
+ ::wm::SetWindowVisibilityAnimationType(desktop_widget->GetNativeView(),
+ animation_type);
RootWindowController* root_window_controller =
GetRootWindowController(root_window);
@@ -235,18 +235,18 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window,
if (wallpaper_delegate->ShouldShowInitialAnimation() ||
root_window_controller->animating_wallpaper_controller() ||
Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) {
- wm::SetWindowVisibilityAnimationTransition(
- desktop_widget->GetNativeView(), wm::ANIMATE_SHOW);
+ ::wm::SetWindowVisibilityAnimationTransition(
+ desktop_widget->GetNativeView(), ::wm::ANIMATE_SHOW);
int duration_override = wallpaper_delegate->GetAnimationDurationOverride();
if (duration_override) {
- wm::SetWindowVisibilityAnimationDuration(
+ ::wm::SetWindowVisibilityAnimationDuration(
desktop_widget->GetNativeView(),
base::TimeDelta::FromMilliseconds(duration_override));
}
} else {
// Disable animation if transition to login screen from an empty background.
- wm::SetWindowVisibilityAnimationTransition(
- desktop_widget->GetNativeView(), wm::ANIMATE_NONE);
+ ::wm::SetWindowVisibilityAnimationTransition(
+ desktop_widget->GetNativeView(), ::wm::ANIMATE_NONE);
}
desktop_widget->SetBounds(params.parent->bounds());
« no previous file with comments | « ash/default_user_wallpaper_delegate.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698