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

Unified Diff: ui/aura/test/test_screen.h

Issue 9696008: TestScreen shouldn't be marked aura export (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 9 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/test/aura_test_base.cc ('k') | ui/aura/test/test_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/test_screen.h
diff --git a/ui/aura/screen_aura.h b/ui/aura/test/test_screen.h
similarity index 58%
rename from ui/aura/screen_aura.h
rename to ui/aura/test/test_screen.h
index ee1540dc51cc62f5b5a92f34a9127378471fecbf..59fe63dba8f5056eba6dbbe18ea549dca950c9ea 100644
--- a/ui/aura/screen_aura.h
+++ b/ui/aura/test/test_screen.h
@@ -1,31 +1,23 @@
-// 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 UI_AURA_TEST_TEST_SCREEN_H_
+#define UI_AURA_TEST_TEST_SCREEN_H_
#pragma once
#include "base/compiler_specific.h"
-#include "ui/aura/aura_export.h"
#include "ui/gfx/insets.h"
#include "ui/gfx/screen.h"
namespace aura {
-
class RootWindow;
-// Aura implementation of gfx::Screen. Implemented here to avoid circular
-// dependencies.
-class AURA_EXPORT ScreenAura : public gfx::Screen {
+// A minimal, testing Aura implementation of gfx::Screen.
+class TestScreen : public gfx::Screen {
public:
- explicit ScreenAura(RootWindow* root_window);
- virtual ~ScreenAura();
-
- void set_work_area_insets(const gfx::Insets& insets) {
- work_area_insets_ = insets;
- }
- const gfx::Insets& work_area_insets() const { return work_area_insets_; }
+ explicit TestScreen(aura::RootWindow* root_window);
+ virtual ~TestScreen();
protected:
virtual gfx::Point GetCursorScreenPointImpl() OVERRIDE;
@@ -45,16 +37,12 @@ class AURA_EXPORT ScreenAura : public gfx::Screen {
// We currently support only one monitor. These two methods return the bounds
// and work area.
gfx::Rect GetBounds();
- gfx::Rect GetWorkAreaBounds();
-
- // 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(TestScreen);
};
} // namespace aura
-#endif // UI_AURA_SCREEN_AURA_H_
+#endif // UI_AURA_TEST_TEST_SCREEN_H_
« no previous file with comments | « ui/aura/test/aura_test_base.cc ('k') | ui/aura/test/test_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698