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

Unified Diff: ash/wm/workspace/desktop_background_fade_controller.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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/wm/workspace/alternate_frame_caption_button.cc ('k') | ash/wm/workspace/phantom_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/desktop_background_fade_controller.cc
diff --git a/ash/wm/workspace/desktop_background_fade_controller.cc b/ash/wm/workspace/desktop_background_fade_controller.cc
index 563d07bfe36c9a26e9427e38a733100028ef4e37..abbdf578c8f6ff1c0f9e8728567a8b4707caf166 100644
--- a/ash/wm/workspace/desktop_background_fade_controller.cc
+++ b/ash/wm/workspace/desktop_background_fade_controller.cc
@@ -20,15 +20,15 @@ DesktopBackgroundFadeController::DesktopBackgroundFadeController(
base::TimeDelta duration,
Direction direction) {
SkColor start_color, target_color;
- ui::Tween::Type tween_type;
+ gfx::Tween::Type tween_type;
if (direction == FADE_OUT) {
start_color = SkColorSetARGB(0, 0, 0, 0);
target_color = SK_ColorBLACK;
- tween_type = ui::Tween::EASE_IN_OUT;
+ tween_type = gfx::Tween::EASE_IN_OUT;
} else {
start_color = SK_ColorBLACK;
target_color = SkColorSetARGB(0, 0, 0, 0);
- tween_type = ui::Tween::EASE_IN_OUT;
+ tween_type = gfx::Tween::EASE_IN_OUT;
}
window_controller_.reset(
« no previous file with comments | « ash/wm/workspace/alternate_frame_caption_button.cc ('k') | ash/wm/workspace/phantom_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698