| Index: ash/screen_ash.h
|
| diff --git a/ui/aura/screen_aura.h b/ash/screen_ash.h
|
| similarity index 77%
|
| copy from ui/aura/screen_aura.h
|
| copy to ash/screen_ash.h
|
| index ee1540dc51cc62f5b5a92f34a9127378471fecbf..deaa76fecbda8454ff20afe62c6676278697b3f0 100644
|
| --- a/ui/aura/screen_aura.h
|
| +++ b/ash/screen_ash.h
|
| @@ -1,26 +1,28 @@
|
| -// 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.
|
|
|
| -#ifndef UI_AURA_SCREEN_AURA_H_
|
| -#define UI_AURA_SCREEN_AURA_H_
|
| +#ifndef ASH_SCREEN_ASH_H_
|
| +#define ASH_SCREEN_ASH_H_
|
| #pragma once
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "ui/aura/aura_export.h"
|
| +#include "ash/ash_export.h"
|
| #include "ui/gfx/insets.h"
|
| #include "ui/gfx/screen.h"
|
|
|
| namespace aura {
|
| -
|
| class RootWindow;
|
| +}
|
| +
|
| +namespace ash {
|
|
|
| // Aura implementation of gfx::Screen. Implemented here to avoid circular
|
| // dependencies.
|
| -class AURA_EXPORT ScreenAura : public gfx::Screen {
|
| +class ASH_EXPORT ScreenAsh : public gfx::Screen {
|
| public:
|
| - explicit ScreenAura(RootWindow* root_window);
|
| - virtual ~ScreenAura();
|
| + explicit ScreenAsh(aura::RootWindow* root_window);
|
| + virtual ~ScreenAsh();
|
|
|
| void set_work_area_insets(const gfx::Insets& insets) {
|
| work_area_insets_ = insets;
|
| @@ -50,11 +52,11 @@ class AURA_EXPORT ScreenAura : public gfx::Screen {
|
| // Insets for the work area.
|
| gfx::Insets work_area_insets_;
|
|
|
| - RootWindow* root_window_;
|
| + aura::RootWindow* root_window_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ScreenAura);
|
| + DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
|
| };
|
|
|
| -} // namespace aura
|
| +} // namespace ash
|
|
|
| -#endif // UI_AURA_SCREEN_AURA_H_
|
| +#endif // ASH_SCREEN_ASH_H_
|
|
|