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

Side by Side Diff: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.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 unified diff | Download patch | Annotate | Revision Log
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 "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" 5 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/desktop_background/user_wallpaper_delegate.h" 8 #include "ash/desktop_background/user_wallpaper_delegate.h"
9 #include "ash/wm/window_animations.h" 9 #include "ash/wm/window_animations.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 : boot_animation_finished_(false), 42 : boot_animation_finished_(false),
43 animation_duration_override_in_ms_(0) { 43 animation_duration_override_in_ms_(0) {
44 } 44 }
45 45
46 virtual ~UserWallpaperDelegate() { 46 virtual ~UserWallpaperDelegate() {
47 } 47 }
48 48
49 virtual int GetAnimationType() OVERRIDE { 49 virtual int GetAnimationType() OVERRIDE {
50 return ShouldShowInitialAnimation() ? 50 return ShouldShowInitialAnimation() ?
51 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE : 51 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE :
52 static_cast<int>(views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); 52 static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
53 } 53 }
54 54
55 virtual int GetAnimationDurationOverride() OVERRIDE { 55 virtual int GetAnimationDurationOverride() OVERRIDE {
56 return animation_duration_override_in_ms_; 56 return animation_duration_override_in_ms_;
57 } 57 }
58 58
59 virtual void SetAnimationDurationOverride( 59 virtual void SetAnimationDurationOverride(
60 int animation_duration_in_ms) OVERRIDE { 60 int animation_duration_in_ms) OVERRIDE {
61 animation_duration_override_in_ms_ = animation_duration_in_ms; 61 animation_duration_override_in_ms_ = animation_duration_in_ms;
62 } 62 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); 125 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
126 }; 126 };
127 127
128 } // namespace 128 } // namespace
129 129
130 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { 130 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
131 return new chromeos::UserWallpaperDelegate(); 131 return new chromeos::UserWallpaperDelegate();
132 } 132 }
133 133
134 } // namespace chromeos 134 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/workspace_controller_unittest.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698