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

Side by Side Diff: ash/desktop_background/desktop_background_view.cc

Issue 802473003: Fix references to ui/gfx headers in a*/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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/session_state_delegate.h" 15 #include "ash/session/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/overview/window_selector_controller.h" 18 #include "ash/wm/overview/window_selector_controller.h"
19 #include "ash/wm/window_animations.h" 19 #include "ash/wm/window_animations.h"
20 #include "base/message_loop/message_loop.h" 20 #include "base/message_loop/message_loop.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "ui/aura/window_event_dispatcher.h" 22 #include "ui/aura/window_event_dispatcher.h"
23 #include "ui/compositor/layer.h" 23 #include "ui/compositor/layer.h"
24 #include "ui/gfx/canvas.h" 24 #include "ui/gfx/canvas.h"
25 #include "ui/gfx/geometry/size_conversions.h"
25 #include "ui/gfx/image/image.h" 26 #include "ui/gfx/image/image.h"
26 #include "ui/gfx/size_conversions.h"
27 #include "ui/gfx/transform.h" 27 #include "ui/gfx/transform.h"
28 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
29 29
30 using wallpaper::WallpaperLayout; 30 using wallpaper::WallpaperLayout;
31 using wallpaper::WALLPAPER_LAYOUT_CENTER; 31 using wallpaper::WALLPAPER_LAYOUT_CENTER;
32 using wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED; 32 using wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED;
33 using wallpaper::WALLPAPER_LAYOUT_STRETCH; 33 using wallpaper::WALLPAPER_LAYOUT_STRETCH;
34 using wallpaper::WALLPAPER_LAYOUT_TILE; 34 using wallpaper::WALLPAPER_LAYOUT_TILE;
35 35
36 namespace ash { 36 namespace ash {
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 // Disable animation if transition to login screen from an empty background. 260 // Disable animation if transition to login screen from an empty background.
261 wm::SetWindowVisibilityAnimationTransition( 261 wm::SetWindowVisibilityAnimationTransition(
262 desktop_widget->GetNativeView(), wm::ANIMATE_NONE); 262 desktop_widget->GetNativeView(), wm::ANIMATE_NONE);
263 } 263 }
264 264
265 desktop_widget->SetBounds(params.parent->bounds()); 265 desktop_widget->SetBounds(params.parent->bounds());
266 return desktop_widget; 266 return desktop_widget;
267 } 267 }
268 268
269 } // namespace ash 269 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698