OLD | NEW |
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/desktop_background/desktop_background_view.h" | 5 #include "ash/desktop_background/desktop_background_view.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "ash/ash_export.h" | 9 #include "ash/ash_export.h" |
10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
11 #include "ash/desktop_background/desktop_background_widget_controller.h" | 11 #include "ash/desktop_background/desktop_background_widget_controller.h" |
12 #include "ash/desktop_background/user_wallpaper_delegate.h" | 12 #include "ash/desktop_background/user_wallpaper_delegate.h" |
13 #include "ash/display/display_manager.h" | 13 #include "ash/display/display_manager.h" |
14 #include "ash/root_window_controller.h" | 14 #include "ash/root_window_controller.h" |
15 #include "ash/session_state_delegate.h" | 15 #include "ash/session_state_delegate.h" |
16 #include "ash/shell.h" | 16 #include "ash/shell.h" |
17 #include "ash/shell_window_ids.h" | 17 #include "ash/shell_window_ids.h" |
18 #include "ash/wm/property_util.h" | |
19 #include "ash/wm/window_animations.h" | 18 #include "ash/wm/window_animations.h" |
20 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
21 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
22 #include "ui/aura/root_window.h" | 21 #include "ui/aura/root_window.h" |
23 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
24 #include "ui/compositor/layer.h" | 23 #include "ui/compositor/layer.h" |
25 #include "ui/gfx/canvas.h" | 24 #include "ui/gfx/canvas.h" |
26 #include "ui/gfx/image/image.h" | 25 #include "ui/gfx/image/image.h" |
27 #include "ui/views/widget/widget.h" | 26 #include "ui/views/widget/widget.h" |
28 | 27 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 views::corewm::SetWindowVisibilityAnimationTransition( | 174 views::corewm::SetWindowVisibilityAnimationTransition( |
176 desktop_widget->GetNativeView(), views::corewm::ANIMATE_NONE); | 175 desktop_widget->GetNativeView(), views::corewm::ANIMATE_NONE); |
177 } | 176 } |
178 | 177 |
179 desktop_widget->SetBounds(params.parent->bounds()); | 178 desktop_widget->SetBounds(params.parent->bounds()); |
180 return desktop_widget; | 179 return desktop_widget; |
181 } | 180 } |
182 | 181 |
183 } // namespace internal | 182 } // namespace internal |
184 } // namespace ash | 183 } // namespace ash |
OLD | NEW |