diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 00:34:48 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 00:34:48 +0000 |
| commit | 49c33c2ddfe099c027bd76a172c65e28f1442bfb (patch) | |
| tree | 9cf6f597a2273dce5d776d6626ebd7b0b00928ef /ui/gfx | |
| parent | c9a7428436a7528c76fd03f4bf324197589b3a58 (diff) | |
| download | chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.zip chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.tar.gz chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.tar.bz2 | |
Revert 125950 - 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
TBR=erg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9667017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx')
| -rw-r--r-- | ui/gfx/screen.h | 4 | ||||
| -rw-r--r-- | ui/gfx/screen_aura.cc (renamed from ui/gfx/screen_ash.cc) | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ui/gfx/screen.h b/ui/gfx/screen.h index a451130..cd363b3 100644 --- a/ui/gfx/screen.h +++ b/ui/gfx/screen.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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_ASH) +#if defined(USE_AURA) // 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. diff --git a/ui/gfx/screen_ash.cc b/ui/gfx/screen_aura.cc index 9df6b84..ea4216f 100644 --- a/ui/gfx/screen_ash.cc +++ b/ui/gfx/screen_aura.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,8 +9,9 @@ namespace gfx { -// gfx can't depend upon ash, otherwise we have circular dependencies. So, -// gfx::Screen is pluggable and Desktop plugs in the real implementation. +// gfx can't depend upon aura, otherwise we have circular dependencies. So, +// gfx::Screen is pluggable for aura and Desktop plugs in the real +// implementation. // static Screen* Screen::instance_ = NULL; |