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

Unified Diff: ash/desktop_background/desktop_background_view.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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/display/screen_position_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 245df7453da0c511d905e3dc644a479a0e70e868..0f14604d73153845d94c82caf9ef697185d43a73 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -191,7 +191,7 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window,
desktop_widget->SetContentsView(
new LayerControlView(new DesktopBackgroundView()));
int animation_type = wallpaper_delegate->GetAnimationType();
- views::corewm::SetWindowVisibilityAnimationType(
+ wm::SetWindowVisibilityAnimationType(
desktop_widget->GetNativeView(), animation_type);
RootWindowController* root_window_controller =
@@ -205,18 +205,18 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window,
if (wallpaper_delegate->ShouldShowInitialAnimation() ||
root_window_controller->animating_wallpaper_controller() ||
Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) {
- views::corewm::SetWindowVisibilityAnimationTransition(
- desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW);
+ wm::SetWindowVisibilityAnimationTransition(
+ desktop_widget->GetNativeView(), wm::ANIMATE_SHOW);
int duration_override = wallpaper_delegate->GetAnimationDurationOverride();
if (duration_override) {
- views::corewm::SetWindowVisibilityAnimationDuration(
+ wm::SetWindowVisibilityAnimationDuration(
desktop_widget->GetNativeView(),
base::TimeDelta::FromMilliseconds(duration_override));
}
} else {
// Disable animation if transition to login screen from an empty background.
- views::corewm::SetWindowVisibilityAnimationTransition(
- desktop_widget->GetNativeView(), views::corewm::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/display/screen_position_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698