diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 00:18:48 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 00:18:48 +0000 |
| commit | 277a3bb5fd9196b3109d0e6ca2ba6a4ec43582b4 (patch) | |
| tree | 94b10b9669fc76bc969be9709d3e2f4cb6b0dc80 /ui/gfx/screen.h | |
| parent | 011352fdfe5524e72ea9aff9cc21b553ff4dc351 (diff) | |
| download | chromium_src-277a3bb5fd9196b3109d0e6ca2ba6a4ec43582b4.zip chromium_src-277a3bb5fd9196b3109d0e6ca2ba6a4ec43582b4.tar.gz chromium_src-277a3bb5fd9196b3109d0e6ca2ba6a4ec43582b4.tar.bz2 | |
Aura/Ash split: Move ScreenAura to aura::RootWindowScreen.
What is now aura::RootWindowScreen was tightly bundled with aura::RootWindow. Instead of moving it to ash::ScreenAsh, I renamed it aurea::RootWindowScreen because there's a bunch of unit tests that use RootWindow as if it were the desktop. Screen integration stuff has been moved out of RootWindow (and related observers) and into ash::Shell.
BUG=116458
Review URL: http://codereview.chromium.org/9616045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/screen.h')
| -rw-r--r-- | ui/gfx/screen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/screen.h b/ui/gfx/screen.h index cd363b3..a451130 100644 --- a/ui/gfx/screen.h +++ b/ui/gfx/screen.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,7 +20,7 @@ class UI_EXPORT Screen { public: virtual ~Screen() {} -#if defined(USE_AURA) +#if defined(USE_ASH) // Sets the instance to use. This takes owernship of |screen|, deleting the // old instance. This is used on aura to avoid circular dependencies between // ui and aura. |