diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 22:09:27 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 22:09:27 +0000 |
| commit | 252eb23175349a777d5e716105a70a876bf11a7d (patch) | |
| tree | 3bceef6f7aa9276a1a324b19fc6cd44cc1842ff1 /ash/root_window_controller.h | |
| parent | 2edd57855cf7cefbe8b3dacff203bdcdddd746e9 (diff) | |
| download | chromium_src-252eb23175349a777d5e716105a70a876bf11a7d.zip chromium_src-252eb23175349a777d5e716105a70a876bf11a7d.tar.gz chromium_src-252eb23175349a777d5e716105a70a876bf11a7d.tar.bz2 | |
ash: Fix CopyAreaToCanvas() scaling issues.
This moves aura's RootWindow::CopyAreaToSkCanvas() to
CopyAreaToCanvas() in x11_util and fixes some physical
vs. display-independent pixel confusion that resulted
in it always failing on non-1x systems.
BUG=152309
Review URL: https://chromiumcodereview.appspot.com/22910003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.h')
| -rw-r--r-- | ash/root_window_controller.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index bbf29ce..140a7d2 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -50,7 +50,6 @@ namespace internal { class AlwaysOnTopController; class AnimatingDesktopController; -class BootSplashScreen; class DesktopBackgroundWidgetController; class DockedWindowLayoutManager; class PanelLayoutManager; @@ -64,6 +63,10 @@ class TouchHudDebug; class TouchHudProjection; class WorkspaceController; +#if defined(USE_X11) +class BootSplashScreen; +#endif + // This class maintains the per root window state for ash. This class // owns the root window and other dependent objects that should be // deleted upon the deletion of the root window. The RootWindowController @@ -255,7 +258,9 @@ class ASH_EXPORT RootWindowController : public ShellObserver { PanelLayoutManager* panel_layout_manager_; scoped_ptr<SystemBackgroundController> system_background_; +#if defined(USE_X11) scoped_ptr<BootSplashScreen> boot_splash_screen_; +#endif scoped_ptr<ScreenDimmer> screen_dimmer_; scoped_ptr<WorkspaceController> workspace_controller_; |